Merge branch 'rs/reflog-expiry-cleanup' into maint-2.39

gitster · gitster · commit 651b4430d19c · 2023-02-14T14:15:56.000-08:00
Code clean-up.

* rs/reflog-expiry-cleanup:
  reflog: clear leftovers in reflog_expiry_cleanup()
diff --git a/reflog.c b/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;
@@ -371,6 +370,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,

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,6 @@ static void mark_reachable(struct expire_reflog_policy_cb *cb)`
`193`	`193`	`commit_list_insert(commit, &leftover);`
`194`	`194`	`continue;`
`195`	`195`	`}`
`196`		`- commit->object.flags \|= REACHABLE;`
`197`	`196`	`parent = commit->parents;`
`198`	`197`	`while (parent) {`
`199`	`198`	`commit = parent->item;`
`@@ -371,6 +370,9 @@ void reflog_expiry_cleanup(void *cb_data)`
`371`	`370`	`clear_commit_marks(cb->tip_commit, REACHABLE);`
`372`	`371`	`break;`
`373`	`372`	`}`
	`373`	`+ for (elem = cb->mark_list; elem; elem = elem->next)`
	`374`	`+ clear_commit_marks(elem->item, REACHABLE);`
	`375`	`+ free_commit_list(cb->mark_list);`
`374`	`376`	`}`
`375`	`377`
`376`	`378`	`int count_reflog_ent(struct object_id *ooid UNUSED,`