diff options
| author | Byron Jones <glob@mozilla.com> | 2014-09-11 16:13:18 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2014-09-11 16:13:18 +0200 |
| commit | 4f8ce64197b948974d74389a64f15835259ce344 (patch) | |
| tree | b7eead31d889a461e9265a32331cba9f3fb5ec91 /extensions/Splinter/web | |
| parent | a446e1976d2d03146501869c35cd1fb8ed149eed (diff) | |
| download | bugzilla-4f8ce64197b948974d74389a64f15835259ce344.tar.gz bugzilla-4f8ce64197b948974d74389a64f15835259ce344.tar.xz | |
Bug 1064329: splinter displays patches that remove lines starting with hyphens incorrectly
Diffstat (limited to 'extensions/Splinter/web')
| -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 4e1439cf8..b33fa778c 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|$)|(?:\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, |