Skip to contentSkip to conversation

patman: Suppress duplicate signoffs only for real patches

PATCH New Simon Glass 3 participants 3 messages May 13, 2014 – May 16, 2014

lore
Share & tools
lore

Simon Glass

author
#0 lore raw

PATCH 1/1 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]>

---

 tools/patman/patchstream.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/patman/patchstream.py +2 -1
index 9f5682c..3228719 100644
@@ -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
Signature · 1 line
1.9.1.423.g4596e3a
#1 lore raw

PATCH 1/1 patman: Suppress duplicate signoffs only for real patches

Quoted 8 lines · Simon Glass

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]>

I have seen the same problem as Masahiro.

Tested-by Michal Simek <[email protected]>

Thanks,
Michal

Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140515/9d36a571/attachment.pgp>
#2 lore raw

PATCH 1/1 patman: Suppress duplicate signoffs only for real patches

In reply to Simon Glass
Quoted 8 lines · Simon Glass

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 Andreas Bie?mann <[email protected]>

should be applied ASAP. Patman is a really useful tool but unusable without this patch.