From: Miklos Vajna <vmiklos@frugalware.org>
Date: Mon, 13 Oct 2008 20:54:25 +0000 (+0200)
Subject: Add testcase to ensure merging an early part of a branch is done properly
X-Git-Tag: v1.6.0.3~17
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4e6d4bc0f0f1388dfcad2af4804b35289ed4ec92;p=git.git

Add testcase to ensure merging an early part of a branch is done properly

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 94bc556cb..5abce3119 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -507,4 +507,30 @@ test_expect_success 'in-index merge' '
 
 test_debug 'gitk --all'
 
+cat >expected <<EOF
+Merge branch 'c5' (early part)
+EOF
+
+test_expect_success 'merge early part of c2' '
+	git reset --hard c3 &&
+	echo c4 > c4.c &&
+	git add c4.c &&
+	git commit -m c4 &&
+	git tag c4 &&
+	echo c5 > c5.c &&
+	git add c5.c &&
+	git commit -m c5 &&
+	git tag c5 &&
+	git reset --hard c3 &&
+	echo c6 > c6.c &&
+	git add c6.c &&
+	git commit -m c6 &&
+	git tag c6 &&
+	git merge c5~1 &&
+	git show -s --pretty=format:%s HEAD > actual &&
+	test_cmp actual expected
+'
+
+test_debug 'gitk --all'
+
 test_done