| commit | 58f4d1b96152a4838eba5fd865c7fffab392b0de | |
| author | Elijah Newren <newren@gmail.com> | |
| Sun, 1 Jul 2018 01:24:57 +0000 (30 18:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jul 2018 20:13:18 +0000 (3 13:13 -0700) | ||
| tree | facc58c18b1144036bf1857dfb40ee96b9e9e43a | treesnapshot (tar.gz zip) |
| parent | 1b9fbefbe08ff2bbcbb8a6089867b32fca603eac | commitdiff |
t6044: verify that merges expected to abort actually abort
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>
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>
| t/t6044-merge-unrelated-index-changes.sh | diffblobblamehistory |