diff options
| author | René Scharfe <l.s.r@web.de> | 2017-12-16 13:12:16 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-19 10:35:00 -0800 |
| commit | 01f9c59ae6f3ab25bbe13c47d3081394ebeeb89d (patch) | |
| tree | 108e9b93469fb3958f3ef784f54436e224d48ea0 /revision.c | |
| parent | 3013dff8662eae06457fe6e5348dfe2270810ab2 (diff) | |
| download | git-rs/revision-keep-pending.tar.gz | |
revision: introduce prepare_revision_walk_extended()rs/revision-keep-pending
prepare_revision_walk() allows callers to take ownership of the array of
pending objects by setting the rev_info flag "leak_pending" and copying
the object_array "pending". They use it to clear commit marks after
setup is done. This interface is brittle enough that it requires
extensive comments.
Provide an easier way by adding a function that can hand over the array
to a caller-supplied output parameter and converting all users of the
flag "leak_pending" to call prepare_revision_walk_extended() instead.
Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/revision.c b/revision.c index d167223e69..21c53148cd 100644 --- a/revision.c +++ b/revision.c @@ -2832,6 +2832,12 @@ void reset_revision_walk(void) int prepare_revision_walk(struct rev_info *revs) { + return prepare_revision_walk_extended(revs, NULL); +} + +int prepare_revision_walk_extended(struct rev_info *revs, + struct object_array *old_pending_ptr) +{ int i; struct object_array old_pending; struct commit_list **next = &revs->commits; @@ -2850,7 +2856,9 @@ int prepare_revision_walk(struct rev_info *revs) } } } - if (!revs->leak_pending) + if (old_pending_ptr) + *old_pending_ptr = old_pending; + else object_array_clear(&old_pending); /* Signal whether we need per-parent treesame decoration */ |