patman: Check commit_match before stripping leading whitespace

True commit lines start at column zero.  Anything that is indented
is part of the commit message instead.  I noticed this by trying to
run buildman with commit e3a4facdfc07179ebe017a07b8de6224a935a9f3
as master, which contained a reference to a Linux commit inside
the commit message.  ProcessLine saw that as a genuite commit
line, and thus buildman tried to build it, and died with an
exception because that SHA is not present in the U-Boot tree.

Signed-off-by: Scott Wood <scottwood@freescale.com>
Acked-by: Simon Glass <sjg@chromium.org>

diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py
index da0488337b29a5fd4db542b58892a14c4e637ee9..8c3a0ec9eee5e7af6bc0ef0820a069e0f74c78aa 100644 (file)
--- a/tools/patman/patchstream.py
+++ b/tools/patman/patchstream.py
@@ -139,6 +139,9 @@ class PatchStream:
         # Initially we have no output. Prepare the input line string
         out = []
         line = line.rstrip('\n')
         # Initially we have no output. Prepare the input line string
         out = []
         line = line.rstrip('\n')

+
+        commit_match = re_commit.match(line) if self.is_log else None
+

         if self.is_log:
             if line[:4] == '    ':
                 line = line[4:]
         if self.is_log:
             if line[:4] == '    ':
                 line = line[4:]


@@ -146,7 +149,6 @@ class PatchStream:
         # Handle state transition and skipping blank lines
         series_tag_match = re_series_tag.match(line)
         commit_tag_match = re_commit_tag.match(line)
         # Handle state transition and skipping blank lines
         series_tag_match = re_series_tag.match(line)
         commit_tag_match = re_commit_tag.match(line)

-        commit_match = re_commit.match(line) if self.is_log else None

         cover_cc_match = re_cover_cc.match(line)
         signoff_match = re_signoff.match(line)
         tag_match = None
         cover_cc_match = re_cover_cc.match(line)
         signoff_match = re_signoff.match(line)
         tag_match = None