summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-06-30 18:24:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-07-03 13:13:18 -0700
commit58f4d1b96152a4838eba5fd865c7fffab392b0de (patch)
treefacc58c18b1144036bf1857dfb40ee96b9e9e43a /builtin/branch.c
parentindex_has_changes(): avoid assuming operating on the_index (diff)
downloadtgif-58f4d1b96152a4838eba5fd865c7fffab392b0de.tar.xz
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>
Diffstat (limited to 'builtin/branch.c')
0 files changed, 0 insertions, 0 deletions