diff options
| author | Simon Glass <sjg@chromium.org> | 2014-05-13 12:14:02 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-05-16 11:42:29 -0700 |
| commit | 6be6b6bcbac62e356d05bdde488fc9f0eef7084a (patch) | |
| tree | 152292e392626c11299ba4842cc7fc7dacb03f87 /tools/patman | |
| parent | 2dabac1337facbdef20d1a9bf54b68225d2518dc (diff) | |
| download | blackbird-obmc-uboot-6be6b6bcbac62e356d05bdde488fc9f0eef7084a.tar.gz blackbird-obmc-uboot-6be6b6bcbac62e356d05bdde488fc9f0eef7084a.zip | |
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>
Diffstat (limited to 'tools/patman')
| -rw-r--r-- | tools/patman/patchstream.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index 9f5682cd0f..3228719207 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 |
