patman: Suppress duplicate signoffs only for real patches
authorSimon Glass <sjg@chromium.org>
Tue, 13 May 2014 18:14:02 +0000 (12:14 -0600)
committerSimon Glass <sjg@chromium.org>
Fri, 16 May 2014 18:42:29 +0000 (11:42 -0700)
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>
tools/patman/patchstream.py

index 9f5682cd0f50a9ba94374c9ccb88dc8bb36ea352..322871920772aeab0682883bdddd185c7b321e73 100644 (file)
@@ -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