Do not mark tags fetched via --tags flag as mergeable
authorJunio C Hamano <junkio@cox.net>
Tue, 27 Dec 2005 19:52:51 +0000 (11:52 -0800)
committerJunio C Hamano <junkio@cox.net>
Tue, 27 Dec 2005 19:52:51 +0000 (11:52 -0800)
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>
git-fetch.sh

index 767ca61..125bcea 100755 (executable)
@@ -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.