ls-tree: add --abbrev[=<n>] option

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index 5bf6d8b613e4916fb4e98d1f873aa220ab76bb92..018c4019532d9eb18dcae4873cd641604e833779 100644 (file)
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -8,7 +8,9 @@ git-ls-tree - Lists the contents of a tree object
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-ls-tree' [-d] [-r] [-t] [-z] [--name-only] [--name-status] <tree-ish> [paths...]
+'git-ls-tree' [-d] [-r] [-t] [-z]
+       [--name-only] [--name-status] [--full-name] [--abbrev=[<n>]]
+       <tree-ish> [paths...]

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


@@ -40,6 +42,11 @@ OPTIONS
 --name-status::
        List only filenames (instead of the "long" output), one per line.
 
 --name-status::
        List only filenames (instead of the "long" output), one per line.
 

+--abbrev[=<n>]::
+       Instead of showing the full 40-byte hexadecimal object
+       lines, show only handful hexdigits prefix.
+       Non default number of digits can be specified with --abbrev=<n>.
+

 paths::
        When paths are given, show them (note that this isn't really raw
        pathnames, but rather a list of patterns to match).  Otherwise
 paths::
        When paths are given, show them (note that this isn't really raw
        pathnames, but rather a list of patterns to match).  Otherwise

diff --git a/ls-tree.c b/ls-tree.c
index d005643ee08e03be2309c02e72522c6a81e8a1c6..97f09bdf81c9e665d392990d70714e40357036d1 100644 (file)
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -13,13 +13,14 @@ static int line_termination = '\n';
 #define LS_TREE_ONLY 2
 #define LS_SHOW_TREES 4
 #define LS_NAME_ONLY 8
 #define LS_TREE_ONLY 2
 #define LS_SHOW_TREES 4
 #define LS_NAME_ONLY 8

+static int abbrev = 0;

 static int ls_options = 0;
 const char **pathspec;
 static int chomp_prefix = 0;
 static const char *prefix;
 
 static const char ls_tree_usage[] =
 static int ls_options = 0;
 const char **pathspec;
 static int chomp_prefix = 0;
 static const char *prefix;
 
 static const char ls_tree_usage[] =

-       "git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] [--full-name] <tree-ish> [path...]";
+       "git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] [--full-name] [--abbrev[=<n>]] <tree-ish> [path...]";

 
 static int show_recursive(const char *base, int baselen, const char *pathname)
 {
 
 static int show_recursive(const char *base, int baselen, const char *pathname)
 {


@@ -73,7 +74,9 @@ static int show_tree(unsigned char *sha1, const char *base, int baselen,
                return 0;
 
        if (!(ls_options & LS_NAME_ONLY))
                return 0;
 
        if (!(ls_options & LS_NAME_ONLY))

-               printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
+               printf("%06o %s %s\t", mode, type,
+                               abbrev ? find_unique_abbrev(sha1,abbrev)
+                                       : sha1_to_hex(sha1));

        write_name_quoted(base + chomp_prefix, baselen - chomp_prefix,
                          pathname,
                          line_termination, stdout);
        write_name_quoted(base + chomp_prefix, baselen - chomp_prefix,
                          pathname,
                          line_termination, stdout);


@@ -113,6 +116,18 @@ int main(int argc, const char **argv)
                                chomp_prefix = 0;
                                break;
                        }
                                chomp_prefix = 0;
                                break;
                        }

+                       if (!strncmp(argv[1]+2, "abbrev=",7)) {
+                               abbrev = strtoul(argv[1]+9, NULL, 10);
+                               if (abbrev && abbrev < MINIMUM_ABBREV)
+                                       abbrev = MINIMUM_ABBREV;
+                               else if (abbrev > 40)
+                                       abbrev = 40;
+                               break;
+                       }
+                       if (!strcmp(argv[1]+2, "abbrev")) {
+                               abbrev = DEFAULT_ABBREV;
+                               break;
+                       }

                        /* otherwise fallthru */
                default:
                        usage(ls_tree_usage);
                        /* otherwise fallthru */
                default:
                        usage(ls_tree_usage);