From: Ilya Yanok Date: Mon, 6 Aug 2012 23:46:05 +0000 (+0000) Subject: patman: fix end of changes detection X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=05e5b73506f0a07660f0930f4ecec6e6f5b7cd03;p=project%2Fbcm63xx%2Fu-boot.git patman: fix end of changes detection Changes may end in '---' line or Signoff line (generated by git format-patch) in case of Series-changes: lines being the last ones in commit message. So detect it properly. Signed-off-by: Ilya Yanok --- diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index be40af3ed2..036b1290f9 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -36,6 +36,9 @@ re_remove = re.compile('^BUG=|^TEST=|^Change-Id:|^Review URL:' # Lines which are allowed after a TEST= line re_allowed_after_test = re.compile('^Signed-off-by:') +# Signoffs +re_signoff = re.compile('^Signed-off-by:') + # The start of the cover letter re_cover = re.compile('^Cover-letter:') @@ -207,6 +210,9 @@ class PatchStream: if is_blank: # Blank line ends this change list self.in_change = 0 + elif line == '---' or re_signoff.match(line): + self.in_change = 0 + out = self.ProcessLine(line) else: self.series.AddChange(self.in_change, self.commit, line) self.skip_blank = False