X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.c;h=804c08c2cf64b84dd259d0c9308818c9dfe59d6d;hb=ee072260dbff6914c24d956bcc2d46882831f1a0;hp=c72064eeb2d8ca979a0aa68c2264bb2c49eb608a;hpb=7b80be150ce137a790f498a69a784d61d8fc2e78;p=git.git

diff --git a/diff.c b/diff.c
index c72064ee..804c08c2 100644
--- a/diff.c
+++ b/diff.c
@@ -963,7 +963,7 @@ void diff_free_filepair(struct diff_filepair *p)
 }
 
 /* This is different from find_unique_abbrev() in that
- * it needs to deal with 0{40} SHA1.
+ * it stuffs the result with dots for alignment.
  */
 const char *diff_unique_abbrev(const unsigned char *sha1, int len)
 {
@@ -973,16 +973,8 @@ const char *diff_unique_abbrev(const unsigned char *sha1, int len)
 		return sha1_to_hex(sha1);
 
 	abbrev = find_unique_abbrev(sha1, len);
-	if (!abbrev) {
-		if (!memcmp(sha1, null_sha1, 20)) {
-			char *buf = sha1_to_hex(null_sha1);
-			if (len < 37)
-				strcpy(buf + len, "...");
-			return buf;
-		}
-		else 
-			return sha1_to_hex(sha1);
-	}
+	if (!abbrev)
+		return sha1_to_hex(sha1);
 	abblen = strlen(abbrev);
 	if (abblen < 37) {
 		static char hex[41];