From: Martin Liska <mliska@suse.cz>
Date: Fri, 8 Nov 2019 08:39:17 +0000 (+0100)
Subject: Make mklog more robust.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=617c564bf04a3b183703c2be725b3243766dfeb5;p=gcc.git

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 5f62e8bf8d6..f6b353959b4 100644
--- 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 1a0e82d1ddd..71fd427ff61 100755
--- 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)