Make mklog more robust.

2019-11-08  Martin Liska  <mliska@suse.cz>

	* mklog: The script fails for patches that contain:
	'---param=foo=bar xyz'.

From-SVN: r277952

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 5f62e8bf8d673fd25fdcfd51f75a6f633529479e..f6b353959b4ddfb10a8dcc563149a3ab425616c7 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-08  Martin Liska  <mliska@suse.cz>
+
+       * mklog: The script fails for patches that contain:
+       '---param=foo=bar xyz'.
+
 2019-09-18  Martin Liska  <mliska@suse.cz>
 
        * clang-format: Tweak configuration based on new

diff --git a/contrib/mklog b/contrib/mklog
index 1a0e82d1ddd09194486c391a2dbd5ca10e39f878..71fd427ff61effe9115b35e35b3155551cc440cf 100755 (executable)
--- a/contrib/mklog
+++ b/contrib/mklog
@@ -178,8 +178,8 @@ class Hunk:
 def is_file_diff_start(s):
   # Don't be fooled by context diff line markers:
   #   *** 385,391 ****
-  return ((s.startswith('***') and not s.endswith('***'))
-          or (s.startswith('---') and not s.endswith('---')))
+  return ((s.startswith('*** ') and not s.endswith('***'))
+          or (s.startswith('--- ') and not s.endswith('---')))
 
 def is_ctx_hunk_start(s):
   return re.match(r'^\*\*\*\*\*\**', s)