Fix CSV diff panic if the file was deleted from both branches #22947
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
lunny
added
the
outdated/backport/v1.18
lunny
approved these changes
Feb 17, 2023
GiteaBot
added
the
lgtm/need 1
kdumontnu
suggested changes
Feb 17, 2023
|
Thank you, I think the complete fix is better. Close this one. |
lunny
pushed a commit
that referenced
this pull request
Feb 20, 2023
Replaces: #22947 Fixes #22946 Probably related to #19530 Basically, many of the diffs were broken because they were comparing to the base commit, where a 3-dot diff should be comparing to the [last common ancestor](https://matthew-brett.github.io/pydagogue/git_diff_dots.html). This should have an integration test so that we don’t run into this issue again. --------- Co-authored-by: Jonathan Tran <jonnytran@gmail.com>
delvh
removed
the
outdated/backport/v1.18
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Close #22946
If a CSV file was deleted from both branches, then baseReader and headReader are nil, no need to "diff" them.
The UI will show a "deleted" change correctly.
ps: This is a quick fix. If you want to see the "deleted content", it needs more work to fine tune. I think it's good enough for a fix, since the file has been deleted from both side already.