diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2006-05-09 01:43:38 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-08 16:25:33 -0700 |
| commit | 31fff305bcc6db3b8082eac7fc9e441b27964fea (patch) | |
| tree | 1681e28441508afae3f3e1bf602c4b0914d9c820 /merge-tree.c | |
| parent | afb4ff206967c6b3e481994cc6d0d86139792169 (diff) | |
| download | git-31fff305bcc6db3b8082eac7fc9e441b27964fea.tar.gz | |
Separate object name errors from usage errors
Separate object name errors from usage errors.
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-tree.c')
| -rw-r--r-- | merge-tree.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |