Fix panic when showing a diff which contains a diff #77
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When committing e.g. a patch-file in a git repository that has a line which contains `--- ` only, `delta` fails with the following error (as it expects such a line to contain keywords for the diff): ``` thread 'delta::tests::test_diff_in_diff' panicked at 'byte index 2 is out of bounds of ``', src/libcore/str/mod.rs:2017:9 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace. ``` This patch changes the diffing behavior to ensure that lines containing `--- ` only won't be parsed.
|
Hi @Ma27, thanks very much for this! (I'm going to be offline for the next ten days so will be slow to review and merge this, but will do ASAP.) |
|
@dandavison would you mind taking another look at this? :) |
… Ma27-fix-diff-in-diff
A similar fix was added at f6d4d33
|
Hi @Ma27, thanks for the ping and sorry for forgetting about this! I've been trying to understand some history here... I think what's happened is that, in the interim, #90 merged a similar change to yours to master, so that your test now passes, without any change to the non-test code. Accordingly, I've pushed some commits to this branch, leaving the new unit test as the change that this branch will introduce when merged. Do you buy all that and does it SGTY? |
LGTM, thanks! 👍 |
|
Great, thanks very much! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When committing e.g. a patch-file in a git repository that has a line
which contains
---only,deltafails with the following error (as itexpects such a line to contain keywords for the diff):
This patch changes the diffing behavior to ensure that lines containing
---only won't be parsed.