From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Feb 2010 19:59:03 GMT
Subject: Re: [PATCH 3/3] fetch --all/--multiple: keep all the fetched branch information
Message-ID: <7vy6iil81k.fsf@alter.siamese.dyndns.org>
In-Reply-To: <63cde7731002241154o40ad7e6eh26f20017f7854fc3@mail.gmail.com>

Michael Lukashov <michael.lukashov@gmail.com> writes:

> Patch 3 does not apply correctly:

It probably has a trivial confict, because there is an added test to the
second patch since I sent it out.  Please add this after applying [2/3].

diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index c18d829..84059d8 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -51,4 +51,25 @@ test_expect_success 'git pull -q -v' '
 	test -s err)
 '
 
+test_expect_success 'git pull --force' '
+	mkdir clonedoldstyle &&
+	(cd clonedoldstyle && git init &&
+	cat >>.git/config <<-\EOF &&
+	[remote "one"]
+		url = ../parent
+		fetch = refs/heads/master:refs/heads/mirror
+	[remote "two"]
+		url = ../parent
+		fetch = refs/heads/master:refs/heads/origin
+	[branch "master"]
+		remote = two
+		merge = refs/heads/master
+	EOF
+	git pull two &&
+	test_commit A &&
+	git branch -f origin &&
+	git pull --all --force
+	)
+'
+
 test_done