summaryrefslogtreecommitdiff
path: root/tools/patman
diff options
context:
space:
mode:
authorDoug Anderson <dianders@chromium.org>2013-03-01 11:11:07 +0000
committerSimon Glass <sjg@chromium.org>2013-04-08 15:21:20 -0700
commit68618281e5090f875a8fa5fee3b2b3a0239d8190 (patch)
tree23ab889f772e6b1b76ea328bae2bee25f7d84126 /tools/patman
parenta1318f7cdc2fcff3b30d39750dd07dbed8f03f21 (diff)
downloadu-boot-imx-68618281e5090f875a8fa5fee3b2b3a0239d8190.zip
u-boot-imx-68618281e5090f875a8fa5fee3b2b3a0239d8190.tar.gz
u-boot-imx-68618281e5090f875a8fa5fee3b2b3a0239d8190.tar.bz2
patman: Don't barf if the word 'commit' starts a line
Patman's regular expression for detecting the start of a commit in a git log was a little simplistic and could be confused if the git log itself had the word "commit" as the start of a line (as this commit does). Make patman a little more robust. Signed-off-by: Doug Anderson <dianders@chromium.org> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'tools/patman')
-rw-r--r--tools/patman/patchstream.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index 4fda852..fc7492e 100644
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -52,7 +52,7 @@ re_series = re.compile('^Series-(\w*): *(.*)')
re_tag = re.compile('^(Tested-by|Acked-by|Reviewed-by|Cc): (.*)')
# The start of a new commit in the git log
-re_commit = re.compile('^commit (.*)')
+re_commit = re.compile('^commit ([0-9a-f]*)$')
# We detect these since checkpatch doesn't always do it
re_space_before_tab = re.compile('^[+].* \t')