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 <sjg@chromium.org> Tested-by: Michal Simek <monstr@monstr.eu> Tested-by: Andreas Bießmann <andreas.devel@googlemail.com>

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 <sjg@chromium.org> Tested-by: Michal Simek <monstr@monstr.eu> Tested-by: Andreas Bießmann <andreas.devel@googlemail.com>
Simon Glass
1 parent 2dabac1337
Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff
tools/patman/patchstream.py
@@ -275,7 +275,8 @@
  
         # 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
...	...	@@ -275,7 +275,8 @@
275	275
276	276	# Suppress duplicate signoffs
277	277	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))):
279	280	out = [line]
280	281
281	282	# Well that means this is an ordinary line