X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=merge-tree.c;h=9dcaab7a85fdb63b2140923a95b216917bfc0993;hp=50528d5e438c62be409a9f7d252cedadfd52b15e;hb=ae448e3854d8b6e7e37aa88fa3917f5dd97f3210;hpb=12d81ce59846e17676c5534257ca2f1783829d63

diff --git a/merge-tree.c b/merge-tree.c
index 50528d5e..9dcaab7a 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);
 }
 
@@ -151,7 +149,7 @@ static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
 	unsigned char sha1[20];
 	void *buf;
 
-	if (get_sha1(rev, sha1) < 0)
+	if (get_sha1(rev, sha1))
 		die("unknown rev %s", rev);
 	buf = fill_tree_descriptor(desc, sha1);
 	if (!buf)