mirror of
https://github.com/git/git.git
synced 2025-01-26 17:33:34 +08:00
reflog: clear leftovers in reflog_expiry_cleanup()
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
8706a59933
commit
b07a819c05
4
reflog.c
4
reflog.c
@ -193,7 +193,6 @@ static void mark_reachable(struct expire_reflog_policy_cb *cb)
|
||||
commit_list_insert(commit, &leftover);
|
||||
continue;
|
||||
}
|
||||
commit->object.flags |= REACHABLE;
|
||||
parent = commit->parents;
|
||||
while (parent) {
|
||||
commit = parent->item;
|
||||
@ -378,6 +377,9 @@ void reflog_expiry_cleanup(void *cb_data)
|
||||
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,
|
||||
|
Loading…
Reference in New Issue
Block a user