X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=merge-tree.c;h=9dcaab7a85fdb63b2140923a95b216917bfc0993;hb=fb6a9f93d39e4e5fdb83673a927f71a34e9fb7c0;hp=cc7b5bd891a213adcc18a44fb9d9ff6d7946cbb3;hpb=6b16250a4551682b026b2592e44077ffa5fbdf2a;p=git.git

diff --git a/merge-tree.c b/merge-tree.c
index cc7b5bd8..9dcaab7a 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -149,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)