summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/patchwork/parser.py2
-rw-r--r--apps/patchwork/tests/patchparser.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/apps/patchwork/parser.py b/apps/patchwork/parser.py
index 2b5e9a0..f460566 100644
--- a/apps/patchwork/parser.py
+++ b/apps/patchwork/parser.py
@@ -68,7 +68,7 @@ def parse_patch(text):
line += '\n'
if state == 0:
- if line.startswith('diff') or line.startswith('===') \
+ if line.startswith('diff ') or line.startswith('===') \
or line.startswith('Index: '):
state = 1
buf += line
diff --git a/apps/patchwork/tests/patchparser.py b/apps/patchwork/tests/patchparser.py
index 3870dc8..06b4e54 100644
--- a/apps/patchwork/tests/patchparser.py
+++ b/apps/patchwork/tests/patchparser.py
@@ -121,6 +121,11 @@ class ListFooterTest(InlinePatchTest):
(self.patch, self.comment) = find_content(self.project, email)
+class DiffWordInCommentTest(InlinePatchTest):
+ test_comment = 'Lines can start with words beginning in "diff"\n' + \
+ 'difficult\nDifferent'
+
+
class UpdateCommentTest(InlinePatchTest):
""" Test for '---\nUpdate: v2' style comments to patches. """
patch_filename = '0001-add-line.patch'