show-ref --hash=len, --abbrev=len, and --abbrev

This teaches show-ref to abbreviate the object name.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-show-ref.txt b/Documentation/git-show-ref.txt
index b724d832c8bef16c46bc7955cdbe7033d713e4a7..5973a82517f2b64e5575b891a2fcee8ad0664b8a 100644 (file)
--- a/Documentation/git-show-ref.txt
+++ b/Documentation/git-show-ref.txt
@@ -9,7 +9,7 @@ SYNOPSIS
 --------
 [verse]
 'git-show-ref' [-q|--quiet] [--verify] [-h|--head] [-d|--dereference]
 --------
 [verse]
 'git-show-ref' [-q|--quiet] [--verify] [-h|--head] [-d|--dereference]

-            [-s|--hash] [--tags] [--heads] [--] <pattern>...
+            [-s|--hash] [--abbrev] [--tags] [--heads] [--] <pattern>...

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -37,14 +37,13 @@ OPTIONS
 
 -d, --dereference::
 
 
 -d, --dereference::
 

-       Dereference tags into object IDs. They will be shown with "^{}"
+       Dereference tags into object IDs as well. They will be shown with "^{}"

        appended.
 
 -s, --hash::
 
        Only show the SHA1 hash, not the reference name. When also using
        appended.
 
 -s, --hash::
 
        Only show the SHA1 hash, not the reference name. When also using

-       --dereference the dereferenced tag will still be shown after the SHA1,
-       this maybe a bug.
+       --dereference the dereferenced tag will still be shown after the SHA1.

 
 --verify::
 
 
 --verify::
 


@@ -52,6 +51,11 @@ OPTIONS
        Aside from returning an error code of 1, it will also print an error
        message if '--quiet' was not specified.
 
        Aside from returning an error code of 1, it will also print an error
        message if '--quiet' was not specified.
 

+--abbrev, --abbrev=len::
+
+       Abbreviate the object name.  When using `--hash`, you do
+       not have to say `--hash --abbrev`; `--hash=len` would do.
+

 -q, --quiet::
 
        Do not print any results to stdout. When combined with '--verify' this
 -q, --quiet::
 
        Do not print any results to stdout. When combined with '--verify' this

diff --git a/builtin-show-ref.c b/builtin-show-ref.c
index 12c457c3c1acb888d4b3442d11db0f8b414c2d82..f2912e825ef237156811d00e11be1eb2abe63eb4 100644 (file)
--- a/builtin-show-ref.c
+++ b/builtin-show-ref.c
@@ -6,12 +6,13 @@
 static const char show_ref_usage[] = "git show-ref [-q|--quiet] [--verify] [-h|--head] [-d|--dereference] [-s|--hash] [--tags] [--heads] [--] [pattern*]";
 
 static int deref_tags = 0, show_head = 0, tags_only = 0, heads_only = 0,
 static const char show_ref_usage[] = "git show-ref [-q|--quiet] [--verify] [-h|--head] [-d|--dereference] [-s|--hash] [--tags] [--heads] [--] [pattern*]";
 
 static int deref_tags = 0, show_head = 0, tags_only = 0, heads_only = 0,

-       found_match = 0, verify = 0, quiet = 0, hash_only = 0;
+       found_match = 0, verify = 0, quiet = 0, hash_only = 0, abbrev = 0;

 static const char **pattern;
 
 static int show_ref(const char *refname, const unsigned char *sha1, int flag, void *cbdata)
 {
        struct object *obj;
 static const char **pattern;
 
 static int show_ref(const char *refname, const unsigned char *sha1, int flag, void *cbdata)
 {
        struct object *obj;

+       const char *hex;

 
        if (tags_only || heads_only) {
                int match;
 
        if (tags_only || heads_only) {
                int match;


@@ -51,13 +52,16 @@ static int show_ref(const char *refname, const unsigned char *sha1, int flag, vo
        }
        if (quiet)
                return 0;
        }
        if (quiet)
                return 0;

+
+       hex = find_unique_abbrev(sha1, abbrev);

        if (hash_only)
        if (hash_only)

-               printf("%s\n", sha1_to_hex(sha1));
+               printf("%s\n", hex);

        else
        else

-               printf("%s %s\n", sha1_to_hex(sha1), refname);
+               printf("%s %s\n", hex, refname);

        if (deref_tags && obj->type == OBJ_TAG) {
                obj = deref_tag(obj, refname, 0);
        if (deref_tags && obj->type == OBJ_TAG) {
                obj = deref_tag(obj, refname, 0);

-               printf("%s %s^{}\n", sha1_to_hex(obj->sha1), refname);
+               hex = find_unique_abbrev(obj->sha1, abbrev);
+               printf("%s %s^{}\n", hex, refname);

        }
        return 0;
 }
        }
        return 0;
 }


@@ -94,6 +98,29 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix)
                        hash_only = 1;
                        continue;
                }
                        hash_only = 1;
                        continue;
                }

+               if (!strncmp(arg, "--hash=", 7) ||
+                   (!strncmp(arg, "--abbrev", 8) &&
+                    (arg[8] == '=' || arg[8] == '\0'))) {
+                       if (arg[3] != 'h' && !arg[8])
+                               /* --abbrev only */
+                               abbrev = DEFAULT_ABBREV;
+                       else {
+                               /* --hash= or --abbrev= */
+                               char *end;
+                               if (arg[3] == 'h') {
+                                       hash_only = 1;
+                                       arg += 7;
+                               }
+                               else
+                                       arg += 9;
+                               abbrev = strtoul(arg, &end, 10);
+                               if (*end || abbrev > 40)
+                                       usage(show_ref_usage);
+                               if (abbrev < MINIMUM_ABBREV)
+                                       abbrev = MINIMUM_ABBREV;
+                       }
+                       continue;
+               }

                if (!strcmp(arg, "--verify")) {
                        verify = 1;
                        continue;
                if (!strcmp(arg, "--verify")) {
                        verify = 1;
                        continue;