summaryrefslogtreecommitdiff
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-12-26 02:42:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-12-26 02:42:05 (GMT)
commitc637bd230dd705b39b22251110eb1fcc8d15b075 (patch)
treedd5787f30bb979f8a700eb134ca77cb69914b416 /commit.c
parentd8e406449aac058ff27f54f3924e1ed9da0928f4 (diff)
parent4cb39fcf19b969cdfa042b65d4d0b62a7fd0ba1e (diff)
downloadgit-c637bd230dd705b39b22251110eb1fcc8d15b075.zip
git-c637bd230dd705b39b22251110eb1fcc8d15b075.tar.gz
git-c637bd230dd705b39b22251110eb1fcc8d15b075.tar.bz2
Merge branch 'rs/clear-commit-marks-cleanup'
Code clean-up. * rs/clear-commit-marks-cleanup: commit: skip already cleared parents in clear_commit_marks_1()
Diffstat (limited to 'commit.c')
-rw-r--r--commit.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/commit.c b/commit.c
index 572301b..d00780b 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;
}