Skip to content

Commit dfd37b7

Browse files
committed
Merge branch 'rs/clear-commit-marks-cleanup' into maint-2.39
Code clean-up. * rs/clear-commit-marks-cleanup: commit: skip already cleared parents in clear_commit_marks_1()
2 parents 7ac5eca + 4cb39fc commit dfd37b7

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

commit.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,8 +701,10 @@ static void clear_commit_marks_1(struct commit_list **plist,
701701
if (!parents)
702702
return;
703703

704-
while ((parents = parents->next))
705-
commit_list_insert(parents->item, plist);
704+
while ((parents = parents->next)) {
705+
if (parents->item->object.flags & mark)
706+
commit_list_insert(parents->item, plist);
707+
}
706708

707709
commit = commit->parents->item;
708710
}

0 commit comments

Comments
 (0)