Null out modification date of index entries when (un)staging lines#1034
Merged
lucasderraugh merged 1 commit intoDec 18, 2024
Merged
Conversation
This fixes an issue where Git would produce incorrect diffs; indicating that a given file was unchanged between the index and the workdir, even though it was different.
Cykelero
force-pushed
the
fix-incorrect-diff-after-staging-lines
branch
from
f7c52a3 to
3d52611
Compare
Collaborator
|
Thanks, I'll take a look probably this weekend. |
Collaborator
|
Thanks, looks like it improves that behavior. |
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
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.
This fixes an issue where GitUp wrote incorrect data to the index, causing both the Git CLI and GitUp itself to produce incorrect diffs.
Reproducing
Red Graphite.themehas changes, and is fully staged. In it, unstage the remove/add deltas at line 9.Fix
For performance, when producing diffs, Git skips reading the contents of files under some conditions. Here, the bug is that Git skips reading our file because it assumes it's identical between the working directory and the stage. Setting the file's date to null in the index prevents that behavior.
Notes
This fix has been in use in Retcon since January 2024, with no noticed adverse effect.