i18n: unpack-trees: avoid substituting only a verb in sentences

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 18f84fbc53883ceb30564b44e604361857aa9f33..6d4e669002b1e58ebf40af5543221d809ffd0427 100644 (file)
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -8,7 +8,7 @@
 
 static const char * const show_ref_usage[] = {
        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"),
+       N_("git show-ref --exclude-existing[=<pattern>]"),
        NULL
 };
 
@@ -30,7 +30,7 @@ static int show_ref(const char *refname, const struct object_id *oid,
                    int flag, void *cbdata)
 {
        const char *hex;
-       unsigned char peeled[20];
+       struct object_id peeled;
 
        if (show_head && !strcmp(refname, "HEAD"))
                goto match;
@@ -82,8 +82,8 @@ static int show_ref(const char *refname, const struct object_id *oid,
        if (!deref_tags)
                return 0;
 
-       if (!peel_ref(refname, peeled)) {
-               hex = find_unique_abbrev(peeled, abbrev);
+       if (!peel_ref(refname, peeled.hash)) {
+               hex = find_unique_abbrev(peeled.hash, abbrev);
                printf("%s %s^{}\n", hex, refname);
        }
        return 0;
@@ -161,11 +161,6 @@ static int exclude_existing_callback(const struct option *opt, const char *arg,
        return 0;
 }
 
-static int help_callback(const struct option *opt, const char *arg, int unset)
-{
-       return -1;
-}
-
 static const struct option show_ref_options[] = {
        OPT_BOOL(0, "tags", &tags_only, N_("only show tags (can be combined with heads)")),
        OPT_BOOL(0, "heads", &heads_only, N_("only show heads (can be combined with tags)")),
@@ -186,18 +181,13 @@ static const struct option show_ref_options[] = {
        { OPTION_CALLBACK, 0, "exclude-existing", &exclude_existing_arg,
          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, N_("show usage"),
-         PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
        OPT_END()
 };
 
 int cmd_show_ref(int argc, const char **argv, const char *prefix)
 {
-       if (argc == 2 && !strcmp(argv[1], "-h"))
-               usage_with_options(show_ref_usage, show_ref_options);
-
        argc = parse_options(argc, argv, prefix, show_ref_options,
-                            show_ref_usage, PARSE_OPT_NO_INTERNAL_HELP);
+                            show_ref_usage, 0);
 
        if (exclude_arg)
                return exclude_existing(exclude_existing_arg);