From: Doug Anderson Date: Fri, 1 Mar 2013 11:11:07 +0000 (+0000) Subject: patman: Don't barf if the word 'commit' starts a line X-Git-Tag: v2013.04-rc3~17 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=68618281e5090f875a8fa5fee3b2b3a0239d8190;p=u-boot 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 Acked-by: Simon Glass --- diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index 4fda852213..fc7492e95a 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')