From: Jeff King <peff@peff.net>
Date: Tue, 22 Apr 2008 11:11:13 +0000 (-0400)
Subject: remote: create fetch config lines with '+'
X-Git-Tag: v1.5.5.2~18
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=1ce89cc4bb18b0e66f7073562d6634f6a9841335;p=git.git

remote: create fetch config lines with '+'

Since git-remote always uses remote tracking branches, it
should be safe to always force updates of those branches.
I.e., we should generate

  fetch = +refs/heads/*:refs/remotes/$remote/*

instead of

  fetch = refs/heads/*:refs/remotes/$remote/*

This was the behavior of the perl version, which seems to
have been lost in the C rewrite.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-remote.c b/builtin-remote.c
index 8fe31dbd9..4149f3b3c 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -105,6 +105,7 @@ static int add(int argc, const char **argv)
 		struct path_list_item *item = track.items + i;
 
 		strbuf_reset(&buf2);
+		strbuf_addch(&buf2, '+');
 		if (mirror)
 			strbuf_addf(&buf2, "refs/%s:refs/%s",
 					item->path, item->path);
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index af2d07779..48ff2d424 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -77,6 +77,16 @@ test_expect_success 'add another remote' '
 )
 '
 
+test_expect_success 'remote forces tracking branches' '
+(
+	cd test &&
+	case `git config remote.second.fetch` in
+	+*) true ;;
+	 *) false ;;
+	esac
+)
+'
+
 test_expect_success 'remove remote' '
 (
 	cd test &&