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 /sha1_name.c | |
| parent | d76c9e95b435b660f8f1b3e01d3c2f934e2ec441 (diff) | |
| download | git-2ce406ccb85c4546b6d19309a6101b37c7bd952e.tar.gz | |
get_merge_bases(): always clean-up object flagsjc/merge-bases
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 'sha1_name.c')
| -rw-r--r-- | sha1_name.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1_name.c b/sha1_name.c index c2c938c4e1..3e9e86cbee 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -987,7 +987,7 @@ int get_sha1_mb(const char *name, unsigned char *sha1) two = lookup_commit_reference_gently(sha1_tmp, 0); if (!two) return -1; - mbs = get_merge_bases(one, two, 1); + mbs = get_merge_bases(one, two); if (!mbs || mbs->next) st = -1; else { |