dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 09:12:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

patman: don't mess with signoffs

Browse Source 
Currently patman assumes that there should be only one Signoff line
and this is obviously incorrect: we often have to work with patches
containing other people signoffs. Moreover, it's really desirable
to preserve the comments between signoffs.

So until some sophisticated signoff processing will be developed I
suggest just don't mess with signoffs at all and treat them like
plain text lines. The only drawback I've found so far is the case
where you have a patch with someones else signoff but not yours and
also have to patman tags under signoff line. In this case you will
get extra empty line between signoffs.

Signed-off-by: Ilya Yanok <ilya.yanok@cogentembedded.com>
This commit is contained in:
Ilya Yanok
2012-08-06 23:46:08 +00:00
committed by Wolfgang Denk
parent 73fe07a79a
commit c7379149ff
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/patman/patchstream.py
View File

@@ -46,7 +46,7 @@ re_cover = re.compile('^Cover-letter:')
re_series = re.compile('^Series-(\w*): *(.*)') re_series = re.compile('^Series-(\w*): *(.*)')
# Commit tags that we want to collect and keep # Commit tags that we want to collect and keep
re_tag = re.compile('^(Tested-by|Acked-by|Signed-off-by|Cc): (.*)') re_tag = re.compile('^(Tested-by|Acked-by|Cc): (.*)')
# The start of a new commit in the git log # The start of a new commit in the git log
re_commit = re.compile('^commit (.*)') re_commit = re.compile('^commit (.*)')
@@ -241,15 +241,8 @@ class PatchStream:
# Detect tags in the commit message # Detect tags in the commit message
elif tag_match: elif tag_match:
# Onlly allow a single signoff tag
if tag_match.group(1) == 'Signed-off-by':
if self.signoff:
self.warn.append('Patch has more than one Signed-off-by '
'tag')
self.signoff += [line]
# Remove Tested-by self, since few will take much notice # Remove Tested-by self, since few will take much notice
elif (tag_match.group(1) == 'Tested-by' and if (tag_match.group(1) == 'Tested-by' and
tag_match.group(2).find(os.getenv('USER') + '@') != -1): tag_match.group(2).find(os.getenv('USER') + '@') != -1):
self.warn.append("Ignoring %s" % line) self.warn.append("Ignoring %s" % line)
elif tag_match.group(1) == 'Cc': elif tag_match.group(1) == 'Cc':
@@ -288,8 +281,6 @@ class PatchStream:
# Output the tags (signeoff first), then change list # Output the tags (signeoff first), then change list
out = [] out = []
if self.signoff:
out += self.signoff
log = self.series.MakeChangeLog(self.commit) log = self.series.MakeChangeLog(self.commit)
out += self.FormatTags(self.tags) out += self.FormatTags(self.tags)
out += [line] + log out += [line] + log