Code

t6036: Test index and worktree state, not just that merge fails
authorElijah Newren <newren@gmail.com>
Mon, 20 Sep 2010 08:28:44 +0000 (02:28 -0600)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Sep 2010 00:32:37 +0000 (17:32 -0700)
commitc976260d0f3d3f99dc3594e3f98436bfd920dc97
tree954c085342faae21fde61dd6c9e73c23134bbf95
parentfa0ae3b1ddeeb8c872f3804950fa95b5fc8b4138
t6036: Test index and worktree state, not just that merge fails

c94736a (merge-recursive: don't segfault while handling rename clashes
2009-07-30) added this testcase with an interesting corner case test,
which previously had cased git to segfault.  This test ensures that the
segfault does not return and that the merge correctly fails; just add
some checks that verify the state of the index and worktree after the merge
are correct.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t6036-recursive-corner-cases.sh