Fix support for Git copy status when status.renames=copies #4892
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
kapral18
force-pushed
the
fix-copy-status-support
branch
2 times, most recently
from
048fcc8 to
605ab26
Compare
Fixes jesseduffield#4890 When Git is configured with status.renames=copies, it can produce status codes starting with "C" (copy) in addition to "R" (rename). The file loader was only checking for "R" prefixes, causing copy operations to be parsed incorrectly and breaking file staging. This fix extends the status parser to handle both "R" and "C" prefixes, ensuring proper support for Git's copy detection feature. Fixes file staging issues when using status.renames=copies configuration.
stefanhaller
force-pushed
the
fix-copy-status-support
branch
from
605ab26 to
e6f3313
Compare
|
Sorry for the long delay in reviewing this. LGTM, thanks for the contribution! Just one observation because I'm not familiar with git's behavior here: the behavior of git's copy detection seems a little weird to me. It only seems to detect a file as being a copy if the original file also occurs in the diff somehow, either because it was moved (like in the example in #4890), or because it was modified. In other words, if I modify a file foo and then copy it, it shows |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Fixes: #4890
status.renames=copiesis configuredThe same issue from #4890
now is fixed