X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=merge-tree.c;h=47181d422cd8b5ef0a01a52aede67b34034784d3;hb=31fff305bcc6db3b8082eac7fc9e441b27964fea;hp=50528d5e438c62be409a9f7d252cedadfd52b15e;hpb=521a3f676794987bfd03703fe58fbec46ed69d49;p=git.git

diff --git a/merge-tree.c b/merge-tree.c
index 50528d5e..47181d42 100644
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -151,7 +151,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)