summaryrefslogtreecommitdiff
path: root/tools/patman
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-09-05 19:00:23 -0600
committerSimon Glass <sjg@chromium.org>2014-09-09 16:38:31 -0600
commit950a23133d8235778ea29f5d9587edec7d9bbc0a (patch)
tree5db30378cf951577c252f4c4b698d5f55381f488 /tools/patman
parentf7582ce8496f19edf845d1f62c4b7f385e4cd864 (diff)
downloadu-boot-imx-950a23133d8235778ea29f5d9587edec7d9bbc0a.zip
u-boot-imx-950a23133d8235778ea29f5d9587edec7d9bbc0a.tar.gz
u-boot-imx-950a23133d8235778ea29f5d9587edec7d9bbc0a.tar.bz2
buildman: Ignore conflicting tags
Tags like Series-version are normally expected to appear once, and with a unique value. But buildman doesn't actually look at these tags. So ignore conflicts. This allows bulidman to build a branch containing multiple patman series. Reported-by: Steve Rae <srae@broadcom.com> Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/patman')
-rw-r--r--tools/patman/patchstream.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index b3e66c3..d630157 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -355,7 +355,7 @@ class PatchStream:
def GetMetaDataForList(commit_range, git_dir=None, count=None,
- series = None):
+ series = None, allow_overwrite=False):
"""Reads out patch series metadata from the commits
This does a 'git log' on the relevant commits and pulls out the tags we
@@ -367,11 +367,13 @@ def GetMetaDataForList(commit_range, git_dir=None, count=None,
count: Number of commits to list, or None for no limit
series: Series object to add information into. By default a new series
is started.
+ allow_overwrite: Allow tags to overwrite an existing tag
Returns:
A Series object containing information about the commits.
"""
if not series:
series = Series()
+ series.allow_overwrite = allow_overwrite
params = gitutil.LogCmd(commit_range,reverse=True, count=count,
git_dir=git_dir)
stdout = command.RunPipe([params], capture=True).stdout