summaryrefslogtreecommitdiff
path: root/tools/patman
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-11-02 06:38:43 +0000
committerTom Rini <trini@ti.com>2012-11-04 11:00:38 -0700
commit619dd5de69bc506e4f4607aa1e698b2fd61b99fe (patch)
tree7b6f87001bf783f2a0a0c1a16a88aea6b869948b /tools/patman
parent57a87a25f7563158d2b8a83d782568f1e6fc7fc5 (diff)
downloadu-boot-imx-619dd5de69bc506e4f4607aa1e698b2fd61b99fe.zip
u-boot-imx-619dd5de69bc506e4f4607aa1e698b2fd61b99fe.tar.gz
u-boot-imx-619dd5de69bc506e4f4607aa1e698b2fd61b99fe.tar.bz2
patman: Add additional tags to ignore
The BRANCH= tag can be used to indicate the destination branch for a commit. Ignore this tag. Also ignore the gerrit 'Commit-Ready:' tag. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/patman')
-rw-r--r--tools/patman/patchstream.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index ad280cc..f7ee75a 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -30,8 +30,8 @@ import gitutil
from series import Series
# Tags that we detect and remove
-re_remove = re.compile('^BUG=|^TEST=|^Change-Id:|^Review URL:'
- '|Reviewed-on:|Reviewed-by:')
+re_remove = re.compile('^BUG=|^TEST=|^BRANCH=|^Change-Id:|^Review URL:'
+ '|Reviewed-on:|Reviewed-by:|Commit-Ready:')
# Lines which are allowed after a TEST= line
re_allowed_after_test = re.compile('^Signed-off-by:')