diff options
| author | Byron Jones <bjones@mozilla.com> | 2013-08-21 17:00:33 +0200 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2013-08-21 17:00:33 +0200 |
| commit | 105963ad11a5f244a34d26a00c178600008d4b27 (patch) | |
| tree | 8941cdbbaedb1e0576bd4efc8ebb6e5b960b0591 /extensions/Splinter | |
| parent | 959457b53ca1764e80de5222c3f0fcad48238a4c (diff) | |
| download | bugzilla-105963ad11a5f244a34d26a00c178600008d4b27.tar.gz bugzilla-105963ad11a5f244a34d26a00c178600008d4b27.tar.xz | |
Bug 900930: Splinter shouldn't choke on patches which have had trailing whitespace removed
Diffstat (limited to 'extensions/Splinter')
| -rw-r--r-- | extensions/Splinter/web/splinter.js | 2 |
1 files changed, 1 insertions, 1 deletions
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, |