From 105963ad11a5f244a34d26a00c178600008d4b27 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Wed, 21 Aug 2013 23:00:33 +0800 Subject: Bug 900930: Splinter shouldn't choke on patches which have had trailing whitespace removed --- extensions/Splinter/web/splinter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'extensions/Splinter') diff --git a/extensions/Splinter/web/splinter.js b/extensions/Splinter/web/splinter.js index e5f22c397..4e1439cf8 100644 --- a/extensions/Splinter/web/splinter.js +++ b/extensions/Splinter/web/splinter.js @@ -247,7 +247,7 @@ Splinter.Patch = { HUNK_START2_RE: /^@@[ \t]+-(\d+),(\d+)[ \t]+\+(\d+)[ \t]+@@(.*)\n/mg, // -l,s +l HUNK_START3_RE: /^@@[ \t]+-(\d+)[ \t]+\+(\d+),(\d+)[ \t]+@@(.*)\n/mg, // -l +l,s HUNK_START4_RE: /^@@[ \t]+-(\d+)[ \t]+\+(\d+)[ \t]+@@(.*)\n/mg, // -l +l - HUNK_RE : /((?:(?!---)[ +\\-].*(?:\n|$))*)/mg, + HUNK_RE : /((?:(?!---)[ +\\-].*(?:\n|$)|(?:\n|$))*)/mg, GIT_BINARY_RE : /^diff --git a\/(\S+).*\n(?:(new|deleted) file mode \d+\n)?(?:index.*\n)?GIT binary patch\n(delta )?/mg, -- cgit v1.2.3-24-g4f1b