From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 3 Aug 2005 11:20:42 +0000 (+0100)
Subject: Fix description/diff delimiting in import
X-Git-Tag: v0.6~20
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/70893e135626f70b60f73380f0190d0f8f0e1089

Fix description/diff delimiting in import

Only '---' should be a valid form of delimiting (or 'diff -') but not
more than three '-'.

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

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index de735c4..43bd2f1 100644
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -90,7 +90,7 @@ def __parse_mail(filename = None):
 
     # the rest of the patch description
     for line in f:
-        if re.match('----*\s*$', line) or re.match('diff -', line):
+        if re.match('---\s*$', line) or re.match('diff -', line):
             break
         else:
             descr += line
@@ -119,7 +119,7 @@ def __parse_patch(filename = None):
             auth = re.findall('^.*?:\s+(.*)$', line)[0]
             authname, authemail = name_email(auth)
 
-        if re.match('----*\s*$', line) or re.match('diff -', line):
+        if re.match('---\s*$', line) or re.match('diff -', line):
             break
         else:
             descr += line