The boundary-based bitmap walk will want to know which commits were
marked UNINTERESTING in the walk used to discover the boundary.
Track which commits are marked as such during list limitation as well as
the topo walk step, though the latter is not used.
Signed-off-by: Taylor Blau <me@xxxxxxxxxxxx>
---
revision.c | 10 +++++++++-
revision.h | 5 +++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/revision.c b/revision.c
index 106ca1ce6c..7177244e7a 100644
--- a/revision.c
+++ b/revision.c
@@ -1446,6 +1446,9 @@ static int limit_list(struct rev_info *revs)
if (process_parents(revs, commit, &original_list, NULL) < 0)
return -1;
if (obj->flags & UNINTERESTING) {
+ if (revs->collect_uninteresting)
+ add_object_array(obj, NULL,
+ &revs->uninteresting_commits);
mark_parents_uninteresting(revs, commit);
slop = still_interesting(original_list, date, slop, &interesting_cache);
if (slop)
@@ -3072,6 +3075,7 @@ void release_revisions(struct rev_info *revs)
diff_free(&revs->pruning);
reflog_walk_info_release(revs->reflog_info);
release_revisions_topo_walk_info(revs->topo_walk_info);
+ object_array_clear(&revs->uninteresting_commits);
}
static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
@@ -3522,8 +3526,12 @@ static void explore_walk_step(struct rev_info *revs)
if (process_parents(revs, c, NULL, NULL) < 0)
return;
- if (c->object.flags & UNINTERESTING)
+ if (c->object.flags & UNINTERESTING) {
+ if (revs->collect_uninteresting)
+ add_object_array(&c->object, NULL,
+ &revs->uninteresting_commits);
mark_parents_uninteresting(revs, c);
+ }
for (p = c->parents; p; p = p->next)
test_flag_and_insert(&info->explore_queue, p->item, TOPO_WALK_EXPLORED);
diff --git a/revision.h b/revision.h
index e8f6de9684..1385b29c76 100644
--- a/revision.h
+++ b/revision.h
@@ -124,6 +124,9 @@ struct rev_info {
/* Parents of shown commits */
struct object_array boundary_commits;
+ /* UNINTERESTING commits between the tips and boundary */
+ struct object_array uninteresting_commits;
+
/* The end-points specified by the end user */
struct rev_cmdline_info cmdline;
@@ -183,6 +186,7 @@ struct rev_info {
unpacked:1,
no_kept_objects:1,
boundary:2,
+ collect_uninteresting:1,
count:1,
left_right:1,
left_only:1,
@@ -404,6 +408,7 @@ struct rev_info {
.expand_tabs_in_log = -1, \
.commit_format = CMIT_FMT_DEFAULT, \
.expand_tabs_in_log_default = 8, \
+ .uninteresting_commits = OBJECT_ARRAY_INIT, \
}
/**
--
2.40.0.380.gda896aa358.dirty
