Skip to content

Commit 6be6b6b

Browse files
committed
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: Simon Glass <[email protected]> Tested-by: Michal Simek <[email protected]> Tested-by: Andreas Bießmann <[email protected]>
1 parent 2dabac1 commit 6be6b6b

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tools/patman/patchstream.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,8 @@ def ProcessLine(self, line):
275275

276276
# Suppress duplicate signoffs
277277
elif signoff_match:
278-
if self.commit.CheckDuplicateSignoff(signoff_match.group(1)):
278+
if (self.is_log or
279+
self.commit.CheckDuplicateSignoff(signoff_match.group(1))):
279280
out = [line]
280281

281282
# Well that means this is an ordinary line

0 commit comments

Comments
 (0)