From 31fff305bcc6db3b8082eac7fc9e441b27964fea Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 9 May 2006 01:43:38 +0400 Subject: Separate object name errors from usage errors Separate object name errors from usage errors. Signed-off-by: Dmitry V. Levin Signed-off-by: Junio C Hamano --- merge-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'merge-tree.c') diff --git a/merge-tree.c b/merge-tree.c index 50528d5e43..47181d422c 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) -- cgit v1.2.1