summaryrefslogtreecommitdiff
path: root/merge-base.c
diff options
context:
space:
mode:
Diffstat (limited to 'merge-base.c')
-rw-r--r--merge-base.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/merge-base.c b/merge-base.c
index 07f5ab4d1c..f0dc06ef55 100644
--- a/merge-base.c
+++ b/merge-base.c
@@ -247,10 +247,12 @@ int main(int argc, char **argv)
usage(merge_base_usage);
argc--; argv++;
}
- if (argc != 3 ||
- get_sha1(argv[1], rev1key) ||
- get_sha1(argv[2], rev2key))
+ if (argc != 3)
usage(merge_base_usage);
+ if (get_sha1(argv[1], rev1key))
+ die("Not a valid object name %s", argv[1]);
+ if (get_sha1(argv[2], rev2key))
+ die("Not a valid object name %s", argv[2]);
rev1 = lookup_commit_reference(rev1key);
rev2 = lookup_commit_reference(rev2key);
if (!rev1 || !rev2)