Skip to content
Snippets Groups Projects
Commit 6be6b6bc authored by Simon Glass's avatar Simon Glass
Browse files

patman: Suppress duplicate signoffs only for real patches


There is an unfortunate bug in the signoff suppression logic. The first
pass is performed with 'git log', and all signoffs are added to the
supression set, such that the second time (when processing the real
patches) we always suppress the signoffs.

Correct this by only suppressing signoffs in the second pass.

Signed-off-by: default avatarSimon Glass <sjg@chromium.org>
Tested-by: default avatarMichal Simek <monstr@monstr.eu>
Tested-by: default avatarAndreas Bießmann <andreas.devel@googlemail.com>
parent 2dabac13
Branches
Tags
No related merge requests found
......@@ -275,7 +275,8 @@ class PatchStream:
# Suppress duplicate signoffs
elif signoff_match:
if self.commit.CheckDuplicateSignoff(signoff_match.group(1)):
if (self.is_log or
self.commit.CheckDuplicateSignoff(signoff_match.group(1))):
out = [line]
# Well that means this is an ordinary line
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment