diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/branch.c | 4 | ||||
| -rw-r--r-- | builtin/fetch.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index d8cccf725d..98fa5d6284 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -122,7 +122,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 @@ -132,7 +132,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."), diff --git a/builtin/fetch.c b/builtin/fetch.c index 8ec4eae3eb..97327e6cc6 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -314,7 +314,7 @@ static int update_local_ref(struct ref *ref, return r; } - if (in_merge_bases(current, &updated, 1)) { + if (in_merge_bases(current, updated)) { char quickref[83]; int r; strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); |