[PATCH] reflog: clear leftovers in reflog_expiry_cleanup()

[PATCH] reflog: clear leftovers in reflog_expiry_cleanup()

[René Scharfe]

reflog_expiry_prepare() calls mark_reachable(), which recurively flags
commits as REACHABLE.  The traversal stops beyond a certain age
threshold; the boundary commits also marked as REACHABLE and put back
into mark_list at the end.  unreachable() finishes the traversal down to
the roots if necessary -- but if all interesting commits are younger
than the age threshold then only recent commits need to be visited.

When this optimization works then the boundary commits still sit there
in mark_list at the end.  Clear their REACHABLE flag and release the
commit list allocations.

While at it remove a duplicate code line from mark_reachable(); the same
flag is already set five lines up.

Signed-off-by: René Scharfe <l.s.r@web.de>
---
Formatted with -U5 for easier review.

 reflog.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/reflog.c b/reflog.c
index 78e9350e20..04630f56ec 100644
--- a/reflog.c
+++ b/reflog.c
@@ -191,11 +191,10 @@ static void mark_reachable(struct expire_reflog_policy_cb *cb)
 		commit->object.flags |= REACHABLE;
 		if (commit->date < expire_limit) {
 			commit_list_insert(commit, &leftover);
 			continue;
 		}
-		commit->object.flags |= REACHABLE;
 		parent = commit->parents;
 		while (parent) {
 			commit = parent->item;
 			parent = parent->next;
 			if (commit->object.flags & REACHABLE)
@@ -369,10 +368,13 @@ void reflog_expiry_cleanup(void *cb_data)
 		break;
 	case UE_NORMAL:
 		clear_commit_marks(cb->tip_commit, REACHABLE);
 		break;
 	}
+	for (elem = cb->mark_list; elem; elem = elem->next)
+		clear_commit_marks(elem->item, REACHABLE);
+	free_commit_list(cb->mark_list);
 }

 int count_reflog_ent(struct object_id *ooid UNUSED,
 		     struct object_id *noid UNUSED,
 		     const char *email UNUSED,
--
2.38.2