Merge branch 'jc/merge-bases'

diff --git a/builtin/branch.c b/builtin/branch.c
index e61b0ece2199f0d2b637cd2ce879105280c38d21..5cb6d78f2c472cc6e579bf6618898f0e44e5ef03 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -130,7 +130,7 @@ static int branch_merged(int kind, const char *name,
        if (!reference_rev)
                reference_rev = head_rev;
 
-       merged = in_merge_bases(rev, &reference_rev, 1);
+       merged = in_merge_bases(rev, reference_rev);
 
        /*
         * After the safety valve is fully redefined to "check with
@@ -140,7 +140,7 @@ static int branch_merged(int kind, const char *name,
         * a gentle reminder is in order.
         */
        if ((head_rev != reference_rev) &&
-           in_merge_bases(rev, &head_rev, 1) != merged) {
+           in_merge_bases(rev, head_rev) != merged) {
                if (merged)
                        warning(_("deleting branch '%s' that has been merged to\n"
                                "         '%s', but not yet merged to HEAD."),