diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-24 00:16:36 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-24 00:16:36 +0300 |
| commit | 0bbab7d2ab61b6aad217706e0879db561e1bdfae (patch) | |
| tree | 63ab2b5c82ce25fcccb8ef3e0a451d87a47a33bf /ref-filter.c | |
| parent | a713fb59e701065efefb82cc862a889d96d6a9c6 (diff) | |
| parent | 6fcec2f9aeeac6329ecf2f7084173f5b4346588b (diff) | |
Merge branch 'rs/lose-leak-pending'
API clean-up around revision traversal.
* rs/lose-leak-pending:
commit: remove unused function clear_commit_marks_for_object_array()
revision: remove the unused flag leak_pending
checkout: avoid using the rev_info flag leak_pending
bundle: avoid using the rev_info flag leak_pending
bisect: avoid using the rev_info flag leak_pending
object: add clear_commit_marks_all()
ref-filter: use clear_commit_marks_many() in do_merge_filter()
commit: use clear_commit_marks_many() in remove_redundant()
commit: avoid allocation in clear_commit_marks_many()
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ref-filter.c b/ref-filter.c index 3f9161707e..f9e25aea7a 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1995,8 +1995,7 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata) free_array_item(item); } - for (i = 0; i < old_nr; i++) - clear_commit_marks(to_clear[i], ALL_REV_FLAGS); + clear_commit_marks_many(old_nr, to_clear, ALL_REV_FLAGS); clear_commit_marks(filter->merge_commit, ALL_REV_FLAGS); free(to_clear); } |