summaryrefslogtreecommitdiff
path: root/t
AgeCommit message (Expand)AuthorFilesLines
2018-07-11t7405: verify 'merge --abort' works after submodule/path conflictsLibravatar Elijah Newren1-0/+31
2018-07-11t7405: add a directory/submodule conflictLibravatar Elijah Newren1-0/+88
2018-07-11t7405: add a file/submodule conflictLibravatar Elijah Newren1-0/+54
2018-07-11merge-recursive: enforce rule that index matches head before mergingLibravatar Elijah Newren3-130/+11
2018-07-11t6044: add more testcases with staged changes before a merge is invokedLibravatar Elijah Newren1-0/+29
2018-07-11merge-recursive: fix assumption that head tree being merged is HEADLibravatar Elijah Newren1-1/+1
2018-07-11merge-recursive: make sure when we say we abort that we actually abortLibravatar Elijah Newren1-1/+1
2018-07-11t6044: add a testcase for index matching head, when head doesn't match HEADLibravatar Elijah Newren1-0/+11
2018-07-11unpack-trees: do not fail reset because of unmerged skipped entryLibravatar Max Kirillov1-0/+59
2018-07-11t6036: add a failed conflict detection case: regular files, different modesLibravatar Elijah Newren1-0/+67
2018-07-11sequencer: handle empty-set cases consistentlyLibravatar Jeff King1-1/+6
2018-07-09gc --auto: release pack files before auto packingLibravatar Kim Gybels1-0/+2
2018-07-09grep.c: teach 'git grep --only-matching'Libravatar Taylor Blau1-0/+15
2018-07-09clone: check connectivity even if clone is partialLibravatar Jonathan Tan1-0/+48
2018-07-09upload-pack: send refs' objects despite "filter"Libravatar Jonathan Tan2-0/+32
2018-07-09send-email: automatically determine transfer-encodingLibravatar brian m. carlson1-0/+21
2018-07-09send-email: accept long lines with suitable transfer encodingLibravatar brian m. carlson1-0/+13
2018-07-09send-email: add an auto option for transfer encodingLibravatar brian m. carlson1-0/+23
2018-07-06userdiff: support new keywords in PHP hunk headerLibravatar Kana Natsuno4-0/+19
2018-07-06t4018: add missing test cases for PHPLibravatar Kana Natsuno3-0/+15
2018-07-06t6036: add lots of detail for directory/file conflicts in recursive caseLibravatar Elijah Newren1-55/+201
2018-07-06t5500: prettify non-commit tag testsLibravatar Jeff King1-6/+13
2018-07-03fetch-pack: support negotiation tip whitelistLibravatar Jonathan Tan1-0/+78
2018-07-03fetch-pack: write shallow, then check connectivityLibravatar Jonathan Tan1-0/+43
2018-07-03ref-filter: avoid backend filtering with --ignore-caseLibravatar Jeff King1-1/+1
2018-07-03t6300: add a test for --ignore-caseLibravatar Jeff King1-0/+11
2018-07-03t6042: add testcase covering long chains of rename conflictsLibravatar Elijah Newren1-0/+111
2018-07-03t6042: add testcase covering rename/rename(2to1)/delete/delete conflictLibravatar Elijah Newren1-0/+68
2018-07-03t6042: add testcase covering rename/add/delete conflict typeLibravatar Elijah Newren1-0/+66
2018-07-03t6036: add a failed conflict detection case with conflicting typesLibravatar Elijah Newren1-0/+75
2018-07-03t6036: add a failed conflict detection case with submodule add/addLibravatar Elijah Newren1-0/+88
2018-07-03t6036: add a failed conflict detection case with submodule modify/modifyLibravatar Elijah Newren1-0/+88
2018-07-03t6036: add a failed conflict detection case with symlink add/addLibravatar Elijah Newren1-0/+66
2018-07-03t6036: add a failed conflict detection case with symlink modify/modifyLibravatar Elijah Newren1-0/+67
2018-07-03t6044: verify that merges expected to abort actually abortLibravatar Elijah Newren1-11/+21
2018-07-03t7201: drop pointless "exit 0" at end of subshellLibravatar Eric Sunshine1-1/+0
2018-07-03t6036: fix broken "merge fails but has appropriate contents" testsLibravatar Eric Sunshine1-4/+4
2018-07-03t5505: modernize and simplify hard-to-digest testLibravatar Eric Sunshine1-6/+2
2018-07-03t5406: use write_script() instead of birthing shell script manuallyLibravatar Eric Sunshine1-2/+3
2018-07-03t5405: use test_must_fail() instead of checking exit code manuallyLibravatar Eric Sunshine1-2/+1
2018-07-03t/lib-submodule-update: fix "absorbing" testLibravatar Eric Sunshine1-3/+2
2018-07-03t: drop unnecessary terminating semicolon in subshellLibravatar Eric Sunshine3-4/+4
2018-07-03t: use sane_unset() rather than 'unset' with broken &&-chainLibravatar Eric Sunshine2-3/+3
2018-07-03t: use test_write_lines() instead of series of 'echo' commandsLibravatar Eric Sunshine10-62/+61
2018-07-03t: use test_might_fail() instead of manipulating exit code manuallyLibravatar Eric Sunshine4-10/+8
2018-07-03fsck: silence stderr when parsing .gitmodulesLibravatar Jeff King1-0/+15
2018-06-28t5407: fix test to cover intended argumentsLibravatar Elijah Newren1-1/+1
2018-06-28Merge branch 'sb/fix-fetching-moved-submodules'Libravatar Junio C Hamano1-5/+1
2018-06-28Merge branch 'jc/clean-after-sanity-tests'Libravatar Junio C Hamano5-9/+6
2018-06-28Merge branch 'nd/completion-negation'Libravatar Junio C Hamano1-2/+39
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 17:25:24 +0000