rev-list --abbrev-commit

This should make --pretty=oneline a whole lot more readable for
people using 80-column terminals.  Originally from Eric Wong.

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

diff --git a/rev-list.c b/rev-list.c
index 22141e2b045bb4e54709ec16c83942fcfdd44ed2..13015026276029bc213972cae234981ee14b06b7 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -30,6 +30,7 @@ static const char rev_list_usage[] =
 "    --unpacked\n"
 "    --header | --pretty\n"
 "    --abbrev=nr | --no-abbrev\n"
 "    --unpacked\n"
 "    --header | --pretty\n"
 "    --abbrev=nr | --no-abbrev\n"

+"    --abbrev-commit\n"

 "  special purpose:\n"
 "    --bisect"
 ;
 "  special purpose:\n"
 "    --bisect"
 ;


@@ -39,6 +40,7 @@ struct rev_info revs;
 static int bisect_list = 0;
 static int verbose_header = 0;
 static int abbrev = DEFAULT_ABBREV;
 static int bisect_list = 0;
 static int verbose_header = 0;
 static int abbrev = DEFAULT_ABBREV;

+static int abbrev_commit = 0;

 static int show_timestamp = 0;
 static int hdr_termination = 0;
 static const char *commit_prefix = "";
 static int show_timestamp = 0;
 static int hdr_termination = 0;
 static const char *commit_prefix = "";


@@ -52,7 +54,10 @@ static void show_commit(struct commit *commit)
                fputs(commit_prefix, stdout);
        if (commit->object.flags & BOUNDARY)
                putchar('-');
                fputs(commit_prefix, stdout);
        if (commit->object.flags & BOUNDARY)
                putchar('-');

-       fputs(sha1_to_hex(commit->object.sha1), stdout);
+       if (abbrev_commit && abbrev)
+               fputs(find_unique_abbrev(commit->object.sha1, abbrev), stdout);
+       else
+               fputs(sha1_to_hex(commit->object.sha1), stdout);

        if (revs.parents) {
                struct commit_list *parents = commit->parents;
                while (parents) {
        if (revs.parents) {
                struct commit_list *parents = commit->parents;
                while (parents) {


@@ -319,6 +324,14 @@ int main(int argc, const char **argv)
                        abbrev = 0;
                        continue;
                }
                        abbrev = 0;
                        continue;
                }

+               if (!strcmp(arg, "--abbrev")) {
+                       abbrev = DEFAULT_ABBREV;
+                       continue;
+               }
+               if (!strcmp(arg, "--abbrev-commit")) {
+                       abbrev_commit = 1;
+                       continue;
+               }

                if (!strncmp(arg, "--abbrev=", 9)) {
                        abbrev = strtoul(arg + 9, NULL, 10);
                        if (abbrev && abbrev < MINIMUM_ABBREV)
                if (!strncmp(arg, "--abbrev=", 9)) {
                        abbrev = strtoul(arg + 9, NULL, 10);
                        if (abbrev && abbrev < MINIMUM_ABBREV)