X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pretty.c;h=428fbb61a331c667b52b1ad6f26c3765f951b6b9;hb=7fcda9201e192413c2e63fe35ce6664dbc81705d;hp=cc460b56970c3869e67feb816f76f4804e37e7ce;hpb=de8139005f04a4a5ad8a54c771475803594028cd;p=git.git

diff --git a/pretty.c b/pretty.c
index cc460b569..428fbb61a 100644
--- a/pretty.c
+++ b/pretty.c
@@ -210,15 +210,13 @@ static void add_merge_info(enum cmit_fmt fmt, struct strbuf *sb,
 	while (parent) {
 		struct commit *p = parent->item;
 		const char *hex = NULL;
-		const char *dots;
 		if (abbrev)
 			hex = find_unique_abbrev(p->object.sha1, abbrev);
 		if (!hex)
 			hex = sha1_to_hex(p->object.sha1);
-		dots = (abbrev && strlen(hex) != 40) ?  "..." : "";
 		parent = parent->next;
 
-		strbuf_addf(sb, " %s%s", hex, dots);
+		strbuf_addf(sb, " %s", hex);
 	}
 	strbuf_addch(sb, '\n');
 }