From 6be6b6bcbac62e356d05bdde488fc9f0eef7084a Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Tue, 13 May 2014 12:14:02 -0600 Subject: patman: Suppress duplicate signoffs only for real patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Michal Simek Tested-by: Andreas Bießmann --- tools/patman/patchstream.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tools') 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 -- cgit v1.1