commit.c: "Merge" fix in pretty_print_commit.

Earlier, f2d4227530499db3e273ae84f30adfd4b70791c6 commit broke Merge:
lines for unabbreviated case.  Do not emit extra dots if we do not
abbreviate.

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

diff --git a/commit.c b/commit.c
index 97205bfb2ceaf77c2b90552327c9a4a1de83a39d..67e11d7a4f211c1d2cf62635029f60597ff618de 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -438,13 +438,13 @@ static int add_merge_info(enum cmit_fmt fmt, char *buf, const struct commit *com
 
        while (parent) {
                struct commit *p = parent->item;
 
        while (parent) {
                struct commit *p = parent->item;

+               const char *hex = abbrev
+                       ? find_unique_abbrev(p->object.sha1, abbrev)
+                       : sha1_to_hex(p->object.sha1);
+               char *dots = (abbrev && strlen(hex) != 40) ? "..." : "";

                parent = parent->next;
 
                parent = parent->next;
 

-               offset += sprintf(buf + offset,
-                                 abbrev ? " %s..." : " %s",
-                                 abbrev
-                                 ? find_unique_abbrev(p->object.sha1, abbrev)
-                                 : sha1_to_hex(p->object.sha1));
+               offset += sprintf(buf + offset, " %s%s", hex, dots);

        }
        buf[offset++] = '\n';
        return offset;
        }
        buf[offset++] = '\n';
        return offset;