From: Catalin Marinas <catalin.marinas@arm.com>
Date: Fri, 31 Jul 2009 09:20:08 +0000 (+0100)
Subject: Improve the description/diff splitting when parsing patches
X-Git-Tag: v0.15-rc2~17
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/efef7effe1ff66cd577cb295a02fd86769335c47

Improve the description/diff splitting when parsing patches

Some patches don't have any of the separations already in use like ---,
diff - or Index. So look for the first "--- */" line.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
---

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 23ba4b3..c769266 100644
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -323,7 +323,7 @@ def post_rebase(crt_series, applied, nopush, merged):
 #
 def __end_descr(line):
     return re.match('---\s*$', line) or re.match('diff -', line) or \
-            re.match('Index: ', line)
+            re.match('Index: ', line) or re.match('--- \w', line)
 
 def __split_descr_diff(string):
     """Return the description and the diff from the given string