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

diff --git a/merge-base.c b/merge-base.c
index 751c3c28..f0dc06ef 100644
--- a/merge-base.c
+++ b/merge-base.c
@@ -236,6 +236,9 @@ int main(int argc, char **argv)
 	struct commit *rev1, *rev2;
 	unsigned char rev1key[20], rev2key[20];
 
+	setup_git_directory();
+	git_config(git_default_config);
+
 	while (1 < argc && argv[1][0] == '-') {
 		char *arg = argv[1];
 		if (!strcmp(arg, "-a") || !strcmp(arg, "--all"))
@@ -244,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)