X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=merge-tree.c;h=cc7b5bd891a213adcc18a44fb9d9ff6d7946cbb3;hb=73136b2e8a8ee024320c5ac6a0f14f912432bf03;hp=50528d5e438c62be409a9f7d252cedadfd52b15e;hpb=a549e11cc2fee10ddf66dd98ea79f7c624eee34e;p=git.git

diff --git a/merge-tree.c b/merge-tree.c
index 50528d5e..cc7b5bd8 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -24,16 +24,14 @@ static const char *sha1_to_hex_zero(const unsigned char *sha1)
 
 static void resolve(const char *base, struct name_entry *branch1, struct name_entry *result)
 {
-	char branch1_sha1[50];
-
 	/* If it's already branch1, don't bother showing it */
 	if (!branch1)
 		return;
-	memcpy(branch1_sha1, sha1_to_hex_zero(branch1->sha1), 41);
 
 	printf("0 %06o->%06o %s->%s %s%s\n",
 		branch1->mode, result->mode,
-		branch1_sha1, sha1_to_hex_zero(result->sha1),
+		sha1_to_hex_zero(branch1->sha1),
+		sha1_to_hex_zero(result->sha1),
 		base, result->path);
 }