summaryrefslogtreecommitdiff
path: root/revision.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 /revision.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 'revision.c')
-rw-r--r--revision.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/revision.c b/revision.c
index f8ee38e..2294b16 100644
--- a/revision.c
+++ b/revision.c
@@ -794,7 +794,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
local_flags = UNINTERESTING;
arg++;
}
- if (get_sha1(arg, sha1) < 0) {
+ if (get_sha1(arg, sha1)) {
int j;
if (seen_dashdash || local_flags)
@@ -820,7 +820,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
if (def && !revs->pending_objects) {
unsigned char sha1[20];
struct object *object;
- if (get_sha1(def, sha1) < 0)
+ if (get_sha1(def, sha1))
die("bad default revision '%s'", def);
object = get_reference(revs, def, sha1, 0);
add_pending_object(revs, object, def);