mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Junio C Hamano
2005-12-27 11:52:51 -08:00
parent e9add36007
commit 36cd2cc7d9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-fetch.sh
View File

@ -192,7 +192,7 @@ then
sed -e ' sed -e '
/\^/d /\^/d
s/^[^ ]* // s/^[^ ]* //
s/.*/&:&/') s/.*/.&:&/')
if test "$#" -gt 1 if test "$#" -gt 1
then then
# remote URL plus explicit refspecs; we need to merge them. # remote URL plus explicit refspecs; we need to merge them.