X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=merge-base.c;h=f0dc06ef5546b148fe20d3b1061c7eae0d262cce;hb=31fff305bcc6db3b8082eac7fc9e441b27964fea;hp=07f5ab4d1c72afeac5e3f193cefe91801ee9a9c9;hpb=48d6e97afe4dcce3bb01922b768cc4d831923e7f;p=git.git

diff --git a/merge-base.c b/merge-base.c
index 07f5ab4d..f0dc06ef 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)