diff-tree: abbreviate merge parent object names with --abbrev --pretty.

When --abbrev is in effect, abbreviate the merge parent names
in prettyprinted output.

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

diff --git a/commit.c b/commit.c
index b8bf35e86081a638137c49e9eabb18c466dec1e5..244104f930b46f0fd1414712446d511d6237ff5d 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -426,9 +426,10 @@ static int is_empty_line(const char *line, int len)
        return !len;
 }
 
-static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int parents)
+static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int parents, int abbrev)
 {
        int offset = 0;
+       unsigned char sha1[20];
 
        if (fmt == CMIT_FMT_ONELINE)
                return offset;
@@ -437,17 +438,25 @@ static int add_parent_info(enum cmit_fmt fmt, char *buf, const char *line, int p
                break;
        case 2:
                /* Go back to the previous line: 40 characters of previous parent, and one '\n' */
-               offset = sprintf(buf, "Merge: %.40s\n", line-41);
+               if (abbrev && !get_sha1_hex(line-41, sha1))
+                       offset = sprintf(buf, "Merge: %s\n",
+                                        find_unique_abbrev(sha1, abbrev));
+               else
+                       offset = sprintf(buf, "Merge: %.40s\n", line-41);
                /* Fallthrough */
        default:
                /* Replace the previous '\n' with a space */
                buf[offset-1] = ' ';
-               offset += sprintf(buf + offset, "%.40s\n", line+7);
+               if (abbrev && !get_sha1_hex(line+7, sha1))
+                       offset += sprintf(buf + offset, "%s\n",
+                                        find_unique_abbrev(sha1, abbrev));
+               else
+                       offset += sprintf(buf + offset, "%.40s\n", line+7);
        }
        return offset;
 }
 
-unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space)
+unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space, int abbrev)
 {
        int hdr = 1, body = 0;
        unsigned long offset = 0;
@@ -488,7 +497,7 @@ unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned l
                        if (!memcmp(line, "parent ", 7)) {
                                if (linelen != 48)
                                        die("bad parent line in commit");
-                               offset += add_parent_info(fmt, buf + offset, line, ++parents);
+                               offset += add_parent_info(fmt, buf + offset, line, ++parents, abbrev);
                        }
 
                        /*

diff --git a/commit.h b/commit.h
index 9c4a244bd90cd96a461a6d6774106b0e6a11fe1e..a8c20964e02256696f974d8a98d514a91c03029d 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -48,7 +48,7 @@ enum cmit_fmt {
 };
 
 extern enum cmit_fmt get_commit_format(const char *arg);
-extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space);
+extern unsigned long pretty_print_commit(enum cmit_fmt fmt, const char *msg, unsigned long len, char *buf, unsigned long space, int abbrev);
 
 /** Removes the first commit from a list sorted by date, and adds all
  * of its parents.

diff --git a/diff-tree.c b/diff-tree.c
index efa2b9476eae679b7f98a4605b07b6637e49de5a..efa17d14a4495937ff4ef27ceba3c76fa76134db 100644 (file)
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -84,7 +84,7 @@ static const char *generate_header(const unsigned char *commit_sha1,
                         diff_unique_abbrev(parent_sha1, abbrev) : "root");
        offset += pretty_print_commit(commit_format, msg, len,
                                      this_header + offset,
-                                     sizeof(this_header) - offset);
+                                     sizeof(this_header) - offset, abbrev);
        return this_header;
 }
 

diff --git a/rev-list.c b/rev-list.c
index e00e6fc76df8236c925e904fa270a2293099d6cf..5fad300635de8901db000510f6fd12a0fbdcae6e 100644 (file)
--- a/rev-list.c
+++ b/rev-list.c
@@ -81,7 +81,7 @@ static void show_commit(struct commit *commit)
 
        if (verbose_header) {
                static char pretty_header[16384];
-               pretty_print_commit(commit_format, commit->buffer, ~0, pretty_header, sizeof(pretty_header));
+               pretty_print_commit(commit_format, commit->buffer, ~0, pretty_header, sizeof(pretty_header), 0);
                printf("%s%c", pretty_header, hdr_termination);
        }
        fflush(stdout);

diff --git a/show-branch.c b/show-branch.c
index 7a0dcc649edaf6a823e15f60d04c6ce67348dc42..d06e577401c67c1d6aed3b5538fccf1eea26567f 100644 (file)
--- a/show-branch.c
+++ b/show-branch.c
@@ -259,7 +259,7 @@ static void show_one_commit(struct commit *commit, int no_name)
        struct commit_name *name = commit->object.util;
        if (commit->object.parsed)
                pretty_print_commit(CMIT_FMT_ONELINE, commit->buffer, ~0,
-                                   pretty, sizeof(pretty));
+                                   pretty, sizeof(pretty), 0);
        else
                strcpy(pretty, "(unavailable)");
        if (!strncmp(pretty, "[PATCH] ", 8))