summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/check-corrupt-objects-carefully'Junio C Hamano2013-04-036-18/+174
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: leave repo in place after checkout errorsJeff King2013-03-292-1/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: run check_everything_connectedJeff King2013-03-273-8/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | clone: die on errors from unpack_treesJeff King2013-03-273-3/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | add tests for cloning corrupted repositoriesJeff King2013-03-271-0/+41
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | streaming_write_entry: propagate streaming errorsJeff King2013-03-272-7/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | add test for streaming corrupt blobsJeff King2013-03-271-0/+34
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid infinite loop in read_istream_looseJeff King2013-03-271-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | read_istream_filtered: propagate read error from upstreamJeff King2013-03-271-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | check_sha1_signature: check return value from read_istreamJeff King2013-03-271-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | stream_blob_to_fd: detect errors reading from streamJeff King2013-03-271-0/+2
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/apply-ws-fix-tab-in-indent'Junio C Hamano2013-04-034-7/+41
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test: resurrect q_to_tabJunio C Hamano2013-03-291-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | apply --whitespace=fix: avoid running over the postimage bufferJunio C Hamano2013-03-224-9/+39
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/difftool-no-overwrite-on-copyback'Junio C Hamano2013-04-032-51/+139
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: run --dir-diff tests with and without symlinksJohn Keeping2013-03-291-8/+19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: fix tests when difftool uses --no-symlinksJohn Keeping2013-03-291-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: don't hide grep outputJohn Keeping2013-03-291-27/+17
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | difftool: don't overwrite modified filesJohn Keeping2013-03-292-14/+101
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7800: move '--symlinks' specific test to the endJohn Keeping2013-03-291-15/+15
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/directory-attrs-regression-fix'Junio C Hamano2013-04-033-19/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t: check that a pattern without trailing slash matches a directoryJeff King2013-03-281-0/+27
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c::match_pathname(): pay attention to the length of string parametersJeff King2013-03-281-1/+12
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c::match_pathname(): adjust patternlen when shifting patternJeff King2013-03-281-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dir.c::match_basename(): pay attention to the length of string parametersJunio C Hamano2013-03-281-4/+36
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr.c::path_matches(): special case paths that end with a slashJunio C Hamano2013-03-281-4/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attr.c::path_matches(): the basename is part of the pathnameJunio C Hamano2013-03-261-9/+10
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls'Junio C Hamano2013-04-035-8/+80
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | checkout: avoid unnecessary match_pathspec callsNguyễn Thái Ngọc Duy2013-03-275-8/+80
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-021-0/+11
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/config-with-empty-section'Junio C Hamano2013-04-021-0/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t1300: document some aesthetic failures of the config editorJeff King2013-03-291-0/+35
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/log-gpg'Junio C Hamano2013-04-021-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log: read gpg settings for signed commit verificationJacob Sarvis2013-03-271-0/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tr/log-tree-optim'Junio C Hamano2013-04-021-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid loading commits twice in log with diffsThomas Rast2013-03-281-3/+10
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/cygwin-shared-repository'Junio C Hamano2013-04-024-3/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make core.sharedRepository work under cygwin 1.7Torsten Bögershausen2013-03-254-3/+36
| | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sw/safe-create-leading-dir-race'Junio C Hamano2013-04-021-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | safe_create_leading_directories: fix race that could give a false negativeSteven Walter2013-03-261-2/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'bk/document-commit-tree-S'Junio C Hamano2013-04-022-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit-tree: document -S option consistentlyBrad King2013-03-252-2/+7
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/no-more-self-assignment'Junio C Hamano2013-04-022-47/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | match-trees: simplify score_trees() using tree_entry()René Scharfe2013-03-251-40/+28
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: clarify logic in show_submodule_summaryJeff King2013-03-221-7/+6
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.3Junio C Hamano2013-04-011-2/+28
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'maint'Junio C Hamano2013-04-011-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update draft release notes to 1.8.2.1Junio C Hamano2013-04-011-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ap/maint-diff-rename-avoid-overlap' into maintJunio C Hamano2013-04-012-1/+67
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'rr/tests-dedup-test-config' into maintJunio C Hamano2013-04-012-10/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \