summaryrefslogtreecommitdiff
path: root/git-fetch.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-27 19:52:51 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-27 19:52:51 (GMT)
commit36cd2cc7d949e1cc39104307fe904c47fe6d5526 (patch)
tree30d90306e751fbb21f6fc3de98ba31f73b9bcec6 /git-fetch.sh
parente9add360074068eac974c5a69f91ae78a30606e9 (diff)
downloadgit-36cd2cc7d949e1cc39104307fe904c47fe6d5526.zip
git-36cd2cc7d949e1cc39104307fe904c47fe6d5526.tar.gz
git-36cd2cc7d949e1cc39104307fe904c47fe6d5526.tar.bz2
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>
Diffstat (limited to 'git-fetch.sh')
-rwxr-xr-xgit-fetch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-fetch.sh b/git-fetch.sh
index 767ca61..125bcea 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.