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 767ca61ca6362b086e70b05f3442fcb4ad475c6a..125bcea1b6e9eef4e7f59f5f1ce511ad8fc3d43e 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -192,7 +192,7 @@ then
                sed -e '
                        /\^/d
                        s/^[^   ]*      //
                sed -e '
                        /\^/d
                        s/^[^   ]*      //

-                       s/.*/&:&/')
+                       s/.*/.&:&/')

        if test "$#" -gt 1
        then
                # remote URL plus explicit refspecs; we need to merge them.
        if test "$#" -gt 1
        then
                # remote URL plus explicit refspecs; we need to merge them.