summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2018-11-08t6036, t6043: increase code coverage for file collision handlingLibravatar Elijah Newren2-0/+88
2018-11-08merge-recursive: improve rename/rename(1to2)/add[/add] handlingLibravatar Elijah Newren2-17/+36
2018-11-08merge-recursive: improve handling for rename/rename(2to1) conflictsLibravatar Elijah Newren3-58/+75
2018-11-08merge-recursive: fix rename/add conflict handlingLibravatar Elijah Newren2-13/+15
2018-11-08merge-recursive: increase marker length with depth of recursionLibravatar Elijah Newren1-0/+151
2018-11-08t6036, t6042: testcases for rename collision of already conflicting filesLibravatar Elijah Newren2-0/+312
2018-11-08t6042: add tests for consistency in file collision conflict handlingLibravatar Elijah Newren1-0/+162
2018-10-18merge-recursive: avoid showing conflicts with merge branch before HEADLibravatar Elijah Newren1-4/+4
2018-09-17Merge branch 'ab/fetch-tags-noclobber'Libravatar Junio C Hamano2-4/+29
2018-09-17Merge branch 'es/worktree-forced-ops-fix'Libravatar Junio C Hamano2-0/+62
2018-09-17Merge branch 'jk/patch-corrupted-delta-fix'Libravatar Junio C Hamano2-4/+93
2018-09-17Merge branch 'ds/commit-graph-tests'Libravatar Junio C Hamano5-10/+13
2018-09-17Merge branch 'jk/pack-objects-with-bitmap-fix'Libravatar Junio C Hamano1-0/+93
2018-09-17Merge branch 'rs/mailinfo-format-flowed'Libravatar Junio C Hamano4-0/+2578
2018-09-17Merge branch 'jk/cocci'Libravatar Junio C Hamano1-1/+1
2018-09-17Merge branch 'es/format-patch-rangediff'Libravatar Junio C Hamano1-0/+12
2018-09-17Merge branch 'es/format-patch-interdiff'Libravatar Junio C Hamano1-0/+34
2018-09-17Merge branch 'cc/delta-islands'Libravatar Junio C Hamano1-0/+143
2018-09-17Merge branch 'jk/trailer-fixes'Libravatar Junio C Hamano4-0/+104
2018-09-17Merge branch 'sb/range-diff-colors'Libravatar Junio C Hamano2-3/+44
2018-09-17Merge branch 'jk/pack-delta-reuse-with-bitmap'Libravatar Junio C Hamano4-40/+173
2018-09-17Merge branch 'nd/unpack-trees-with-cache-tree'Libravatar Junio C Hamano2-0/+10
2018-09-17Merge branch 'ds/reachable'Libravatar Junio C Hamano4-0/+374
2018-09-17Merge branch 'tg/rerere'Libravatar Junio C Hamano1-0/+65
2018-09-17Merge branch 'ds/multi-pack-index'Libravatar Junio C Hamano4-0/+270
2018-09-17Merge branch 'jk/rev-list-stdin-noop-is-ok'Libravatar Junio C Hamano1-1/+1
2018-09-17Merge branch 'bp/checkout-new-branch-optim'Libravatar Junio C Hamano1-0/+14
2018-09-17Merge branch 'sg/t1404-update-ref-test-timeout'Libravatar Junio C Hamano1-3/+3
2018-09-17Merge branch 'nd/clone-case-smashing-warning'Libravatar Junio C Hamano1-1/+7
2018-09-17Merge branch 'mk/http-backend-content-length'Libravatar Junio C Hamano1-2/+2
2018-09-11http-backend test: make empty CONTENT_LENGTH test more realisticLibravatar Max Kirillov1-2/+2
2018-09-10Merge branch 'jn/submodule-core-worktree-revert'Libravatar Junio C Hamano2-8/+2
2018-09-10Merge branch 'mk/http-backend-content-length'Libravatar Junio C Hamano1-0/+11
2018-09-07Revert "Merge branch 'sb/submodule-core-worktree'"Libravatar Jonathan Nieder2-8/+2
2018-09-07http-backend: allow empty CONTENT_LENGTHLibravatar Max Kirillov1-0/+11
2018-09-04Merge branch 'es/chain-lint-more'Libravatar Junio C Hamano5-4/+18
2018-09-04Merge branch 'ab/portable-more'Libravatar Junio C Hamano10-44/+53
2018-09-04Merge branch 'en/directory-renames-nothanks'Libravatar Junio C Hamano1-1/+109
2018-09-04Merge branch 'pw/rebase-i-author-script-fix'Libravatar Junio C Hamano1-3/+15
2018-09-04t5310: test delta reuse with bitmapsLibravatar Jeff King1-0/+93
2018-08-31fetch: stop clobbering existing tags without --forceLibravatar Ævar Arnfjörð Bjarmason2-4/+5
2018-08-31fetch tests: add a test for clobbering tag behaviorLibravatar Ævar Arnfjörð Bjarmason1-0/+24
2018-08-31push tests: use spaces in interpolated stringLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2018-08-31push tests: make use of unused $1 in test descriptionLibravatar Ævar Arnfjörð Bjarmason1-1/+1
2018-08-30t5303: use printf to generate delta basesLibravatar Jeff King1-10/+10
2018-08-30patch-delta: handle truncated copy parametersLibravatar Jeff King1-1/+1
2018-08-30patch-delta: consistently report corruptionLibravatar Jann Horn1-0/+30
2018-08-30patch-delta: fix oob readLibravatar Jann Horn1-1/+1
2018-08-30t5303: test some corrupt deltasLibravatar Jeff King1-0/+59
2018-08-30test-delta: read input into a heap bufferLibravatar Jeff King1-4/+4