Merge branch 'es/checkout-index-temp'

diff --git a/sha1_name.c b/sha1_name.c
index cb88170252a26c37d90f5c03263136439ec60e54..cf2a83b14381ae02e737e6135561aab401f1f7e8 100644 (file)
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -993,7 +993,7 @@ int get_sha1_mb(const char *name, unsigned char *sha1)
        two = lookup_commit_reference_gently(sha1_tmp, 0);
        if (!two)
                return -1;
-       mbs = get_merge_bases(one, two, 1);
+       mbs = get_merge_bases(one, two);
        if (!mbs || mbs->next)
                st = -1;
        else {