diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:35:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:36:05 -0700 |
| commit | 34f5130af84f7a37fba327d5a5be4f4427dc6886 (patch) | |
| tree | 1f8836fe7fb70566e31b3f4f5d1475fabd95981b /builtin/branch.c | |
| parent | 0083f1d43a7280aefa23656eaac7266139484b24 (diff) | |
| parent | f37d3c755209234acfc2ca280027ebdab8e9ea8a (diff) | |
| download | git-34f5130af84f7a37fba327d5a5be4f4427dc6886.tar.gz git-34f5130af84f7a37fba327d5a5be4f4427dc6886.tar.xz | |
Merge branch 'jc/merge-bases'
Optimise the "merge-base" computation a bit, and also update its
users that do not need the full merge-base information to call a
cheaper subset.
* jc/merge-bases:
reduce_heads(): reimplement on top of remove_redundant()
merge-base: "--is-ancestor A B"
get_merge_bases_many(): walk from many tips in parallel
in_merge_bases(): use paint_down_to_common()
merge_bases_many(): split out the logic to paint history
in_merge_bases(): omit unnecessary redundant common ancestor reduction
http-push: use in_merge_bases() for fast-forward check
receive-pack: use in_merge_bases() for fast-forward check
in_merge_bases(): support only one "other" commit
Diffstat (limited to 'builtin/branch.c')
| -rw-r--r-- | builtin/branch.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index e61b0ece2..5cb6d78f2 100644 --- 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."), |