aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-02-14 14:15:56 -0800
committerJunio C Hamano <gitster@pobox.com>2023-02-14 14:15:56 -0800
commitdfd37b70b10bb55ed71dfc6c5d63feed22f9ffb0 (patch)
tree583ea24be246191bfedb8e148781f6ae8c0fccde
parentMerge branch 'rs/am-parse-options-cleanup' into maint-2.39 (diff)
parentcommit: skip already cleared parents in clear_commit_marks_1() (diff)
downloadgit-dfd37b70b10bb55ed71dfc6c5d63feed22f9ffb0.tar.gz
git-dfd37b70b10bb55ed71dfc6c5d63feed22f9ffb0.zip
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()
-rw-r--r--commit.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/commit.c b/commit.c
index 572301b80a..d00780bee5 100644
--- a/commit.c
+++ b/commit.c
@@ -701,8 +701,10 @@ static void clear_commit_marks_1(struct commit_list **plist,
if (!parents)
return;
- while ((parents = parents->next))
- commit_list_insert(parents->item, plist);
+ while ((parents = parents->next)) {
+ if (parents->item->object.flags & mark)
+ commit_list_insert(parents->item, plist);
+ }
commit = commit->parents->item;
}