X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pretty.c;h=6cd91491d348b9aabea902c0ea60465074e9c06e;hb=a84bde927c0882db78a37d40168e98add63f2307;hp=29f81c3f44f7cc9185b23b75ac3e119d04b2c6c7;hpb=d20d654fe8923a502527547b17fe284d15d6aec9;p=git.git

diff --git a/pretty.c b/pretty.c
index 29f81c3f4..6cd91491d 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');
 }