From: Junio C Hamano <junkio@cox.net>
Date: Tue, 27 Dec 2005 19:52:51 +0000 (-0800)
Subject: Do not mark tags fetched via --tags flag as mergeable
X-Git-Tag: v1.0.6^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=36cd2cc7d949e1cc39104307fe904c47fe6d5526;p=git.git

Do not mark tags fetched via --tags flag as mergeable

Otherwise "git pull --tags" would mistakenly try to merge all of
them, which is never what the user wants.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/git-fetch.sh b/git-fetch.sh
index 767ca61ca..125bcea1b 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -192,7 +192,7 @@ then
 		sed -e '
 			/\^/d
 			s/^[^	]*	//
-			s/.*/&:&/')
+			s/.*/.&:&/')
 	if test "$#" -gt 1
 	then
 		# remote URL plus explicit refspecs; we need to merge them.