diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fetch.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/builtin/fetch.c b/builtin/fetch.c index 767406ee05..683f70d71e 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -664,12 +664,18 @@ static int update_local_ref(struct ref *ref, if (!is_null_oid(&ref->old_oid) && starts_with(ref->name, "refs/tags/")) { - int r; - r = s_update_ref("updating tag", ref, 0); - format_display(display, r ? '!' : 't', _("[tag update]"), - r ? _("unable to update local ref") : NULL, - remote, pretty_ref, summary_width); - return r; + if (force || ref->force) { + int r; + r = s_update_ref("updating tag", ref, 0); + format_display(display, r ? '!' : 't', _("[tag update]"), + r ? _("unable to update local ref") : NULL, + remote, pretty_ref, summary_width); + return r; + } else { + format_display(display, '!', _("[rejected]"), _("would clobber existing tag"), + remote, pretty_ref, summary_width); + return 1; + } } current = lookup_commit_reference_gently(&ref->old_oid, 1); |