Skip to content

Always enable "strict mode" in parsePatch #508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ExplodingCabbage merged 32 commits into from
Mar 20, 2024
Merged

Always enable "strict mode" in parsePatch #508

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0a3e140
Remove 'strict' option; make strict mode always-on
ExplodingCabbage Mar 20, 2024
f0e78ae
Support multi-file patches with no 'Index: ' or 'diff ' line but with…
ExplodingCabbage Mar 20, 2024
c2cac94
Fix wrong line numbers in a patch in the tests
ExplodingCabbage Mar 20, 2024
33940b3
Fix wrong line numbers in another patch in the tests
ExplodingCabbage Mar 20, 2024
ba3ff94
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
011e3b8
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
fd7458f
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
82da1a2
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
804caa5
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
f3ff7cb
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
8c7f280
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
51e54eb
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
fbb4fa4
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
3a73a48
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
a6953c2
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
362aa94
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
5b3a73c
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
d6457cb
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
bade558
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
f377aa5
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
e6d96c3
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
d8ee0a4
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
a219fed
Fix wrong line numbers in another test (but it still fails - interest…
ExplodingCabbage Mar 20, 2024
6e6a76a
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
6fd385e
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
57ba0b1
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
8ebe646
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
009a79b
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
b5c8f14
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
be766d1
Fix wrong line numbers in another test
ExplodingCabbage Mar 20, 2024
6a9bde9
Remove a failing test whose intention I can't make sense of. What doe…
ExplodingCabbage Mar 20, 2024
dec3099
Add release notes
ExplodingCabbage Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix wrong line numbers in another test
  • Loading branch information
@ExplodingCabbage
ExplodingCabbage committed Mar 20, 2024
commit 6e6a76a4128492c5cfe7cde75677a3acc05acd2a
4 changes: 2 additions & 2 deletions test/patch/merge.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,7 @@ describe('patch/merge', function() {

it('should handle multiple conflicts in one hunk', function() {
const mine =
'@@ -1,10 +1,10 @@\n'
'@@ -1,7 +1,7 @@\n'
+ ' line1\n'
+ '-line2\n'
+ '+line2-1\n'
Expand All @@ -1025,7 +1025,7 @@ describe('patch/merge', function() {
+ '+line6-1\n'
+ ' line7\n';
const theirs =
'@@ -1,10 +1,10 @@\n'
'@@ -1,7 +1,7 @@\n'
+ ' line1\n'
+ '-line2\n'
+ '+line2-2\n'
Expand Down