Re: [PATCH/Test] Build in merge is broken

From: Sverre Hvammen Johansen <hvammen@gmail.com>
Date: Jul 14, 2008, 02:15 UTC
Message-ID: <402c10cd0807131915u6567cba9h361d26d3dc003739@mail.gmail.com>
In-Reply-To: <20080713184300.GF10347@genesis.frugalware.org>

Test cases for build in merge. --- After applying Miklos's fix there still are some breakages. I have squashed in another test case. c1 is merged with c1 and c2. Three parents are recorded in the merge commit object; c1, c1, and c2.

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

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 16f4608..80cfee6 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -465,4 +465,26 @@ 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_expect_success 'merge c1 with c1 and c2' '
+       git reset --hard c1 &&
+       git config branch.master.mergeoptions "" &&
+       test_tick &&
+       git merge c1 c2 &&
+       verify_merge file result.1-5 &&
+       verify_parents $c1 $c2
+'
+
+test_debug 'gitk --all'
+
 test_done

-- 
1.5.5.54.gc6550

-- 
Sverre Hvammen Johansen