summaryrefslogtreecommitdiff
path: root/builtin/branch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-27 21:46:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-28 01:36:39 (GMT)
commita20efee9cfcf9c68bb01d0aa82ffc7903d88bab4 (patch)
treee329f429d9abd42f015099a072efedcfd385ec46 /builtin/branch.c
parentd0f1ea6003d97e63110fa7d50bb07f546a909b6e (diff)
downloadgit-a20efee9cfcf9c68bb01d0aa82ffc7903d88bab4.zip
git-a20efee9cfcf9c68bb01d0aa82ffc7903d88bab4.tar.gz
git-a20efee9cfcf9c68bb01d0aa82ffc7903d88bab4.tar.bz2
in_merge_bases(): support only one "other" commit
In early days of its life, I planned to make it possible to compute "is a commit contained in all of these other commits?" with this function, but it turned out that no caller needed it. Just make it take two commit objects and add a comment to say what these two functions do. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
-rw-r--r--builtin/branch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c
index d8cccf7..98fa5d6 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."),