Merge branch 'jc/revision-range-unpeel' into maint

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 17ada88dfb9543ba782b84507b451fabfec28e10..87806ad5b088f5c905757a4fab3c3499ec20a308 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -7,8 +7,8 @@
 #include "parse-options.h"
 
 static const char * const show_ref_usage[] = {
-       "git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] ",
-       "git show-ref --exclude-existing[=pattern] < ref-list",
+       N_("git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] "),
+       N_("git show-ref --exclude-existing[=pattern] < ref-list"),
        NULL
 };
 
@@ -28,10 +28,12 @@ static void show_one(const char *refname, const unsigned char *sha1)
 
 static int show_ref(const char *refname, const unsigned char *sha1, int flag, void *cbdata)
 {
-       struct object *obj;
        const char *hex;
        unsigned char peeled[20];
 
+       if (show_head && !strcmp(refname, "HEAD"))
+               goto match;
+
        if (tags_only || heads_only) {
                int match;
 
@@ -79,25 +81,9 @@ static int show_ref(const char *refname, const unsigned char *sha1, int flag, vo
        if (!deref_tags)
                return 0;
 
-       if ((flag & REF_ISPACKED) && !peel_ref(refname, peeled)) {
-               if (!is_null_sha1(peeled)) {
-                       hex = find_unique_abbrev(peeled, abbrev);
-                       printf("%s %s^{}\n", hex, refname);
-               }
-       }
-       else {
-               obj = parse_object(sha1);
-               if (!obj)
-                       die("git show-ref: bad ref %s (%s)", refname,
-                           sha1_to_hex(sha1));
-               if (obj->type == OBJ_TAG) {
-                       obj = deref_tag(obj, refname, 0);
-                       if (!obj)
-                               die("git show-ref: bad tag at ref %s (%s)", refname,
-                                   sha1_to_hex(sha1));
-                       hex = find_unique_abbrev(obj->sha1, abbrev);
-                       printf("%s %s^{}\n", hex, refname);
-               }
+       if (!peel_ref(refname, peeled)) {
+               hex = find_unique_abbrev(peeled, abbrev);
+               printf("%s %s^{}\n", hex, refname);
        }
        return 0;
 }
@@ -105,7 +91,7 @@ static int show_ref(const char *refname, const unsigned char *sha1, int flag, vo
 static int add_existing(const char *refname, const unsigned char *sha1, int flag, void *cbdata)
 {
        struct string_list *list = (struct string_list *)cbdata;
-       string_list_insert(refname, list);
+       string_list_insert(list, refname);
        return 0;
 }
 
@@ -120,7 +106,7 @@ static int add_existing(const char *refname, const unsigned char *sha1, int flag
  */
 static int exclude_existing(const char *match)
 {
-       static struct string_list existing_refs = { NULL, 0, 0, 0 };
+       static struct string_list existing_refs = STRING_LIST_INIT_DUP;
        char buf[1024];
        int matchlen = match ? strlen(match) : 0;
 
@@ -145,7 +131,7 @@ static int exclude_existing(const char *match)
                        if (strncmp(ref, match, matchlen))
                                continue;
                }
-               if (check_ref_format(ref)) {
+               if (check_refname_format(ref, 0)) {
                        warning("ref '%s' ignored", ref);
                        continue;
                }
@@ -179,25 +165,27 @@ static int help_callback(const struct option *opt, const char *arg, int unset)
 }
 
 static const struct option show_ref_options[] = {
-       OPT_BOOLEAN(0, "tags", &tags_only, "only show tags (can be combined with heads)"),
-       OPT_BOOLEAN(0, "heads", &heads_only, "only show heads (can be combined with tags)"),
-       OPT_BOOLEAN(0, "verify", &verify, "stricter reference checking, "
-                   "requires exact ref path"),
+       OPT_BOOLEAN(0, "tags", &tags_only, N_("only show tags (can be combined with heads)")),
+       OPT_BOOLEAN(0, "heads", &heads_only, N_("only show heads (can be combined with tags)")),
+       OPT_BOOLEAN(0, "verify", &verify, N_("stricter reference checking, "
+                   "requires exact ref path")),
        { OPTION_BOOLEAN, 'h', NULL, &show_head, NULL,
-         "show the HEAD reference",
+         N_("show the HEAD reference, even if it would be filtered out"),
          PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
-       OPT_BOOLEAN(0, "head", &show_head, "show the HEAD reference"),
+       OPT_BOOLEAN(0, "head", &show_head,
+         N_("show the HEAD reference, even if it would be filtered out")),
        OPT_BOOLEAN('d', "dereference", &deref_tags,
-                   "dereference tags into object IDs"),
-       { OPTION_CALLBACK, 's', "hash", &abbrev, "n",
-         "only show SHA1 hash using <n> digits",
+                   N_("dereference tags into object IDs")),
+       { OPTION_CALLBACK, 's', "hash", &abbrev, N_("n"),
+         N_("only show SHA1 hash using <n> digits"),
          PARSE_OPT_OPTARG, &hash_callback },
        OPT__ABBREV(&abbrev),
-       OPT__QUIET(&quiet),
+       OPT__QUIET(&quiet,
+                  N_("do not print results to stdout (useful with --verify)")),
        { OPTION_CALLBACK, 0, "exclude-existing", &exclude_existing_arg,
-         "pattern", "show refs from stdin that aren't in local repository",
+         N_("pattern"), N_("show refs from stdin that aren't in local repository"),
          PARSE_OPT_OPTARG | PARSE_OPT_NONEG, exclude_existing_callback },
-       { OPTION_CALLBACK, 0, "help-all", NULL, NULL, "show usage",
+       { OPTION_CALLBACK, 0, "help-all", NULL, NULL, N_("show usage"),
          PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
        OPT_END()
 };
@@ -224,7 +212,7 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix)
                        unsigned char sha1[20];
 
                        if (!prefixcmp(*pattern, "refs/") &&
-                           resolve_ref(*pattern, sha1, 1, NULL)) {
+                           !read_ref(*pattern, sha1)) {
                                if (!quiet)
                                        show_one(*pattern, sha1);
                        }