diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-10-30 12:20:44 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-10-30 12:51:10 -0700 |
| commit | 2ce406ccb85c4546b6d19309a6101b37c7bd952e (patch) | |
| tree | ed00f07eab627dc4217ac76e38a652201f99aac2 /builtin/rev-parse.c | |
| parent | d76c9e95b435b660f8f1b3e01d3c2f934e2ec441 (diff) | |
| download | git-2ce406ccb85c4546b6d19309a6101b37c7bd952e.tar.gz git-2ce406ccb85c4546b6d19309a6101b37c7bd952e.tar.xz | |
get_merge_bases(): always clean-up object flags
The callers of get_merge_bases() can choose to leave object flags
used during the merge-base traversal by passing cleanup=0 as a
parameter, but in practice a very few callers can afford to do so
(namely, "git merge-base"), as they need to compute merge base in
preparation for other processing of their own and they need to see
the object without contaminate flags.
Change the function signature of get_merge_bases_many() and
get_merge_bases() to drop the cleanup parameter, so that the
majority of the callers do not have to say ", 1" at the end.
Give a new get_merge_bases_many_dirty() API to support only a few
callers that know they do not need to spend cycles cleaning up the
object flags.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rev-parse.c')
| -rw-r--r-- | builtin/rev-parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index 1a6122d3a..ed6db3731 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -277,7 +277,7 @@ static int try_difference(const char *arg) struct commit *a, *b; a = lookup_commit_reference(sha1); b = lookup_commit_reference(end); - exclude = get_merge_bases(a, b, 1); + exclude = get_merge_bases(a, b); while (exclude) { struct commit_list *n = exclude->next; show_rev(REVERSED, |