From 6bfb27a0c5d742306905ed9c0962ba3c0a091625 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 2 Feb 2006 17:52:19 -0800 Subject: [PATCH] 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 --- commit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/commit.c b/commit.c index 97205bfb2c..67e11d7a4f 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; -- 2.11.4.GIT