Finally fix diff names #13136
Merged
Finally fix diff names #13136
Conversation
This file contains hidden or 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
go-gitea#12771 attempted to fix diff by avoiding the git diff line as it is possible to have an ambiguous line here. go-gitea#12254 attempted to fix diff by assuming that names would quoted if they needed to be and if one was quoted then both would be. Both of these were wrong. I have now discovered `--src-prefix` and `--dst-prefix` which means that we can set this in such a way to force the git diff to always be unambiguous. Therefore this PR rollsback most of the changes in go-gitea#12771 and uses these options to fix this. Signed-off-by: Andrew Thornton <[email protected]>
zeripath
commented
Oct 13, 2020
GiteaBot
added
the
lgtm/need 2
zeripath
commented
Oct 13, 2020
zeripath
commented
Oct 13, 2020
Signed-off-by: Andrew Thornton <[email protected]>
Member
|
Why are rename from and rename to cases removed? |
Contributor
Author
|
Because they're no longer needed. That code was added when we couldn't get the names from the git diff line - so I've stopped back to the code that was there before. I can add them back in if preferred. Parsepatch needs rewriting in any case as can't parse anything with -- or ++ at the start of a line |
techknowlogick
approved these changes
Oct 14, 2020
Member
techknowlogick
left a comment
techknowlogick
left a comment
There was a problem hiding this comment.
I've confirmed that this works on git 1.8
GiteaBot
added
lgtm/need 1
lafriks
approved these changes
Oct 14, 2020
GiteaBot
added
lgtm/done
Member
|
🚀 |
Codecov Report
@@ Coverage Diff @@
## master #13136 +/- ##
==========================================
- Coverage 42.36% 42.07% -0.29%
==========================================
Files 677 678 +1
Lines 74627 75029 +402
==========================================
- Hits 31616 31571 -45
- Misses 37865 38320 +455
+ Partials 5146 5138 -8
Continue to review full report at Codecov.
|
Member
|
Please send backport |
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Oct 14, 2020
Backport go-gitea#13136 it is possible to have an ambiguous line here. if they needed to be and if one was quoted then both would be. Both of these were wrong. I have now discovered `--src-prefix` and `--dst-prefix` which means that we can set this in such a way to force the git diff to always be unambiguous. Therefore this PR rollsback most of the changes in go-gitea#12771 and uses these options to fix this. Signed-off-by: Andrew Thornton <[email protected]>
lafriks
pushed a commit
that referenced
this pull request
Oct 14, 2020
Backport #13136 it is possible to have an ambiguous line here. if they needed to be and if one was quoted then both would be. Both of these were wrong. I have now discovered `--src-prefix` and `--dst-prefix` which means that we can set this in such a way to force the git diff to always be unambiguous. Therefore this PR rollsback most of the changes in #12771 and uses these options to fix this. Signed-off-by: Andrew Thornton <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
#12771 attempted to fix diff by avoiding the git diff line as
it is possible to have an ambiguous line here.
#12254 attempted to fix diff by assuming that names would quoted
if they needed to be and if one was quoted then both would be.
Both of these were wrong.
I have now discovered
--src-prefixand--dst-prefixwhichmeans that we can set this in such a way to force the git diff
to always be unambiguous.
Therefore this PR rollsback most of the changes in #12771 and
uses these options to fix this.
Fix #13060
Signed-off-by: Andrew Thornton [email protected]