From: Santi Béjar <sbejar@gmail.com>
Date: Sat, 23 Sep 2006 20:55:35 +0000 (+0200)
Subject: Add test for the default merges in fetch.
X-Git-Tag: v1.4.3-rc1~44^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6cc7c36d5e2fd89be596a164bcc2afede9d855d3;p=git.git

Add test for the default merges in fetch.

[jc: with minor fix-ups]

Signed-off-by: Santi Béjar <sbejar@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index e71581a95..df0ae4811 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -27,6 +27,16 @@ test_expect_success "clone and setup child repos" '
 		echo "URL: ../one/.git/"
 		echo "Pull: refs/heads/master:refs/heads/one"
 	} >.git/remotes/one
+	cd .. &&
+	git clone . three &&
+	cd three &&
+	git repo-config branch.master.remote two &&
+	git repo-config branch.master.merge refs/heads/one &&
+	{
+		echo "URL: ../two/.git/"
+		echo "Pull: refs/heads/master:refs/heads/two"
+		echo "Pull: refs/heads/one:refs/heads/one"
+	} >.git/remotes/two
 '
 
 test_expect_success "fetch test" '
@@ -41,4 +51,19 @@ test_expect_success "fetch test" '
 	test "z$mine" = "z$his"
 '
 
+test_expect_success "fetch test for-merge" '
+	cd "$D" &&
+	cd three &&
+	git fetch &&
+	test -f .git/refs/heads/two &&
+	test -f .git/refs/heads/one &&
+	master_in_two=`cd ../two && git rev-parse master` &&
+	one_in_two=`cd ../two && git rev-parse one` &&
+	{
+		echo "$master_in_two	not-for-merge"
+		echo "$one_in_two	"
+	} >expected &&
+	cut -f -2 .git/FETCH_HEAD >actual &&
+	diff expected actual'
+
 test_done