summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-02-15 23:18:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-02-15 23:18:11 (GMT)
commite17cec27d18c730dae738684d2f5df1dbd54a804 (patch)
tree3207a54751b246c7b3ecd71c9858cf6ac0bffda0 /revision.c
parent04afcc2201ddb399031484eb9769393bade2529d (diff)
parent6fcec2f9aeeac6329ecf2f7084173f5b4346588b (diff)
downloadgit-e17cec27d18c730dae738684d2f5df1dbd54a804.zip
git-e17cec27d18c730dae738684d2f5df1dbd54a804.tar.gz
git-e17cec27d18c730dae738684d2f5df1dbd54a804.tar.bz2
Merge branch 'rs/lose-leak-pending' into maint
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 'revision.c')
-rw-r--r--revision.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/revision.c b/revision.c
index 72f2b45..1f7454c 100644
--- a/revision.c
+++ b/revision.c
@@ -2862,8 +2862,7 @@ int prepare_revision_walk(struct rev_info *revs)
}
}
}
- if (!revs->leak_pending)
- object_array_clear(&old_pending);
+ object_array_clear(&old_pending);
/* Signal whether we need per-parent treesame decoration */
if (revs->simplify_merges ||