Merge branch 'jk/maint-upload-archive'

diff --git a/builtin/tag.c b/builtin/tag.c
index cca120552a89bf6be4a5fe2d9b187eba2af04d15..efb98726955837294190fcef365e45b0dd5f5396 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -173,7 +173,7 @@ static int for_each_tag_name(const char **argv, each_tag_name_fn fn)
                        had_error = 1;
                        continue;
                }
-               if (!resolve_ref(ref, sha1, 1, NULL)) {
+               if (read_ref(ref, sha1)) {
                        error(_("tag '%s' not found."), *p);
                        had_error = 1;
                        continue;
@@ -454,7 +454,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
        if (strbuf_check_tag_ref(&ref, tag))
                die(_("'%s' is not a valid tag name."), tag);
 
-       if (!resolve_ref(ref.buf, prev, 1, NULL))
+       if (read_ref(ref.buf, prev))
                hashclr(prev);
        else if (!force)
                die(_("tag '%s' already exists"), tag);