undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t6044: verify that merges expected to abort actually abort

Browse Source 
t6044 has lots of tests for verifying that merge will abort as expected
when there are changes staged before the merge starts.  However, it only
checked for non-zero exit code, which could mean that the merge ran to
completion with conflicts.  Check that the merge was actually correctly
aborted, i.e. that .git/MERGE_HEAD is not present.

This changes one of the tests from expect_success to expect_failure.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2018-06-30 18:24:57 -07:00 committed by Junio C Hamano
parent 1b9fbefbe0
commit 58f4d1b961
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
t/t6044-merge-unrelated-index-changes.sh
View File

@ -82,7 +82,8 @@ test_expect_success 'ff update, important file modified' '
touch subdir/e &&
git add subdir/e &&
test_must_fail git merge E^0
test_must_fail git merge E^0 &&
test_path_is_missing .git/MERGE_HEAD
'
test_expect_success 'resolve, trivial' '
@ -91,7 +92,8 @@ test_expect_success 'resolve, trivial' '
touch random_file && git add random_file &&
test_must_fail git merge -s resolve C^0
test_must_fail git merge -s resolve C^0 &&
test_path_is_missing .git/MERGE_HEAD
'
test_expect_success 'resolve, non-trivial' '
@ -100,7 +102,8 @@ test_expect_success 'resolve, non-trivial' '
touch random_file && git add random_file &&
test_must_fail git merge -s resolve D^0
test_must_fail git merge -s resolve D^0 &&
test_path_is_missing .git/MERGE_HEAD
'
test_expect_success 'recursive' '
@ -109,16 +112,18 @@ test_expect_success 'recursive' '
touch random_file && git add random_file &&
test_must_fail git merge -s recursive C^0
test_must_fail git merge -s recursive C^0 &&
test_path_is_missing .git/MERGE_HEAD
'
test_expect_success 'recursive, when merge branch matches merge base' '
test_expect_failure 'recursive, when merge branch matches merge base' '
git reset --hard &&
git checkout B^0 &&
touch random_file && git add random_file &&
test_must_fail git merge -s recursive F^0
test_must_fail git merge -s recursive F^0 &&
test_path_is_missing .git/MERGE_HEAD
'
test_expect_success 'octopus, unrelated file touched' '
@ -127,7 +132,8 @@ test_expect_success 'octopus, unrelated file touched' '
touch random_file && git add random_file &&
test_must_fail git merge C^0 D^0
test_must_fail git merge C^0 D^0 &&
test_path_is_missing .git/MERGE_HEAD
'
test_expect_success 'octopus, related file removed' '
@ -136,7 +142,8 @@ test_expect_success 'octopus, related file removed' '
git rm b &&
test_must_fail git merge C^0 D^0
test_must_fail git merge C^0 D^0 &&
test_path_is_missing .git/MERGE_HEAD
'
test_expect_success 'octopus, related file modified' '
@ -145,7 +152,8 @@ test_expect_success 'octopus, related file modified' '
echo 12 >>a && git add a &&
test_must_fail git merge C^0 D^0
test_must_fail git merge C^0 D^0 &&
test_path_is_missing .git/MERGE_HEAD
'
test_expect_success 'ours' '
@ -154,7 +162,8 @@ test_expect_success 'ours' '
touch random_file && git add random_file &&
test_must_fail git merge -s ours C^0
test_must_fail git merge -s ours C^0 &&
test_path_is_missing .git/MERGE_HEAD
'
test_expect_success 'subtree' '
@ -163,7 +172,8 @@ test_expect_success 'subtree' '
touch random_file && git add random_file &&
test_must_fail git merge -s subtree E^0
test_must_fail git merge -s subtree E^0 &&
test_path_is_missing .git/MERGE_HEAD
'
test_done