summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-08 23:40:23 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-08 23:40:23 (GMT)
commit45f75a0167b4a4693f2c6005bf7db231ca91ecc8 (patch)
treed7cb273a493d3b37aad4a41284cd8e2fb68f80c4 /merge-tree.c
parentfd60acaced6de16ebfb66959067e2b29f99a133e (diff)
parent31fff305bcc6db3b8082eac7fc9e441b27964fea (diff)
downloadgit-45f75a0167b4a4693f2c6005bf7db231ca91ecc8.zip
git-45f75a0167b4a4693f2c6005bf7db231ca91ecc8.tar.gz
git-45f75a0167b4a4693f2c6005bf7db231ca91ecc8.tar.bz2
Merge branch 'fix'
* fix: Separate object name errors from usage errors Documentation: {caret} fixes (git-rev-list.txt) Fix "git diff --stat" with long filenames Fix repo-config set-multivar error return path.
Diffstat (limited to 'merge-tree.c')
-rw-r--r--merge-tree.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-tree.c b/merge-tree.c
index cc7b5bd..9dcaab7 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)