[PATCH/Test] Build in merge is broken

From: Sverre Hvammen Johansen <hvammen+git@gmail.com>
Date: Jul 13, 2008, 08:13 UTC
Message-ID: <loom.20080713T073129-112@post.gmane.org>

This test case shows breakage of build in merge. This have been bisected to 1c7b76be Build in merge.

--- Great that we now are introducing merge in C. Great job Miklos. However, it is broken as this patch shows. This have been bisected to 1c7b76be Build in merge.

The test case when run will record the parents that were asked for which is fine. However, only c2 is recorded as a parent in the commit object. Both c1 and c2 should have been recorded. The merge is otherwise working correctly.

 t/t7600-merge.sh |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 16f4608..a96a497 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -465,4 +465,15 @@ test_expect_success 'merge log message' '
 
 test_debug 'gitk --all'
 
+test_expect_success 'merge c1 with c0, c2, c0, and c1' '
+       git reset --hard c1 &&
+       git config branch.master.mergeoptions "" &&
+       test_tick &&
+       git merge c0 c2 c0 c1 &&
+       verify_merge file result.1-5 &&
+       verify_parents $c1 $c2
+'
+
+test_debug 'gitk --all'
+
 test_done

-- 
1.5.5.54.gc6550