Message ID | 1400004843-2306-1-git-send-email-sjg@chromium.org |
---|---|
State | Accepted |
Delegated to: | Simon Glass |
Headers | show |
On 05/13/2014 08:14 PM, Simon Glass wrote: > 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> I have seen the same problem as Masahiro. Tested-by: Michal Simek <monstr@monstr.eu> Thanks, Michal
On 05/13/2014 08:14 PM, Simon Glass wrote: > 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: Andreas Bießmann <andreas.devel@googlemail.com> should be applied ASAP. Patman is a really useful tool but unusable without this patch.
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index 9f5682c..3228719 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -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
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> --- tools/patman/patchstream.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)