summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-08-28 09:43:38 -0600
committerSimon Glass <sjg@chromium.org>2014-09-05 13:40:42 -0600
commitd0c5719d92c85addcd38e1dcc21cbc4cbc0fc6a5 (patch)
tree441a53129aa1fdc6c3c8544fe784d5329ff79887
parent9447a6b2f6c4bab325cd6b52df82b099664f80c5 (diff)
downloadu-boot-imx-d0c5719d92c85addcd38e1dcc21cbc4cbc0fc6a5.zip
u-boot-imx-d0c5719d92c85addcd38e1dcc21cbc4cbc0fc6a5.tar.gz
u-boot-imx-d0c5719d92c85addcd38e1dcc21cbc4cbc0fc6a5.tar.bz2
patman: Avoid changing the order of tags
patman collects tags that it sees in the commit and places them nicely sorted at the end of the patch. However, this is not really necessary and in fact is apparently not desirable. Suggested-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Signed-off-by: Simon Glass <sjg@chromium.org> Tested-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--tools/patman/patchstream.py14
1 files changed, 1 insertions, 13 deletions
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index 322374c..b0b8153 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -72,7 +72,6 @@ class PatchStream:
self.in_change = 0 # Non-zero if we are in a change list
self.blank_count = 0 # Number of blank lines stored up
self.state = STATE_MSG_HEADER # What state are we in?
- self.tags = [] # Tags collected, like Tested-by...
self.signoff = [] # Contents of signoff line
self.commit = None # Current commit
@@ -113,16 +112,6 @@ class PatchStream:
self.series.AddCommit(self.commit)
self.commit = None
- def FormatTags(self, tags):
- out_list = []
- for tag in sorted(tags):
- if tag.startswith('Cc:'):
- tag_list = tag[4:].split(',')
- out_list += gitutil.BuildEmailList(tag_list, 'Cc:')
- else:
- out_list.append(tag)
- return out_list
-
def ProcessLine(self, line):
"""Process a single line of a patch file or commit log
@@ -271,7 +260,7 @@ class PatchStream:
elif tag_match.group(1) == 'Patch-cc':
self.commit.AddCc(tag_match.group(2).split(','))
else:
- self.tags.append(line);
+ out = [line]
# Suppress duplicate signoffs
elif signoff_match:
@@ -311,7 +300,6 @@ class PatchStream:
# Output the tags (signeoff first), then change list
out = []
log = self.series.MakeChangeLog(self.commit)
- out += self.FormatTags(self.tags)
out += [line]
if self.commit:
out += self.commit.notes