From efef7effe1ff66cd577cb295a02fd86769335c47 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 31 Jul 2009 10:20:08 +0100 Subject: [PATCH] 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 --- stgit/commands/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- 2.11.0