"git-fetch --tags $URL" should not overwrite existing tags

Use the same --exclude-existing filter as we use for automatic
tag following to avoid overwriting existing tags with replacement
ones the other side created.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-fetch.sh b/git-fetch.sh
index 357cac28b2e44abb8356368761be78b378e5ae2e..ca984e739a595131dca4070982f524d3a53f9637 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -253,23 +253,10 @@ if test "$tags"
 then
        taglist=`IFS='  ' &&
                  echo "$ls_remote_result" |
 then
        taglist=`IFS='  ' &&
                  echo "$ls_remote_result" |

+                 git-show-ref --exclude-existing=refs/tags/ |

                  while read sha1 name
                  do
                  while read sha1 name
                  do

-                       case "$sha1" in
-                       fail)
-                               exit 1
-                       esac
-                       case "$name" in
-                       *^*) continue ;;
-                       refs/tags/*) ;;
-                       *) continue ;;
-                       esac
-                       if git-check-ref-format "$name"
-                       then
-                           echo ".${name}:${name}"
-                       else
-                           echo >&2 "warning: tag ${name} ignored"
-                       fi
+                       echo ".${name}:${name}"

                  done` || exit
        if test "$#" -gt 1
        then
                  done` || exit
        if test "$#" -gt 1
        then