git-am: use apply --cached

diff --git a/merge-base.c b/merge-base.c
index e73fca7453e8141b3f371a1aeba483c9ed946ccc..f0dc06ef5546b148fe20d3b1061c7eae0d262cce 100644 (file)
--- a/merge-base.c
+++ b/merge-base.c
@@ -237,6 +237,7 @@ int main(int argc, char **argv)
        unsigned char rev1key[20], rev2key[20];
 
        setup_git_directory();
+       git_config(git_default_config);
 
        while (1 < argc && argv[1][0] == '-') {
                char *arg = argv[1];
@@ -246,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)