diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-11 13:41:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-12 23:31:00 -0800 |
| commit | 85b1f98871f19617ff7ee8ec245fe4e817a74aa4 (patch) | |
| tree | 543f5dfdd7cdd65550f087b18c4fff4840c268df | |
| parent | for-each-reflog: not having $GIT_DIR/logs directory is not an error. (diff) | |
| download | git-85b1f98871f19617ff7ee8ec245fe4e817a74aa4.tar.gz git-85b1f98871f19617ff7ee8ec245fe4e817a74aa4.zip | |
"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>
| -rwxr-xr-x | git-fetch.sh | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index 357cac28b2..ca984e739a 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -253,23 +253,10 @@ if test "$tags" then taglist=`IFS=' ' && echo "$ls_remote_result" | + git-show-ref --exclude-existing=refs/tags/ | 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 |