Skip to content

Commit 36cd2cc

Browse files
author
Junio C Hamano
committed
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>
1 parent e9add36 commit 36cd2cc

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

git-fetch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ then
192192
sed -e '
193193
/\^/d
194194
s/^[^ ]* //
195-
s/.*/&:&/')
195+
s/.*/.&:&/')
196196
if test "$#" -gt 1
197197
then
198198
# remote URL plus explicit refspecs; we need to merge them.

0 commit comments

Comments
 (0)