From: Junio C Hamano <junkio@cox.net>
Date: Fri, 3 Feb 2006 01:52:19 +0000 (-0800)
Subject: commit.c: "Merge" fix in pretty_print_commit.
X-Git-Tag: v1.2.0~74
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6bfb27a0c5d742306905ed9c0962ba3c0a091625;p=git.git

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 97205bfb..67e11d7a 100644
--- 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;
+		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;
 
-		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;