Checkout typechange-only deltas #4369
Merged
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
When performing a forced checkout, treat files as modified when the workdir or the index is identical except for the mode. This ensures that force checkout will update the mode to the target. (Apply this check for regular files only, if one of the items was a file and the other was another type of item then this would be a typechange and handled independently.)
On Windows, we do not support file mode changes, so do not test for type changes between the disk and tree being checked out. We could have false positives since the on-disk file can only have an (effective) mode of 0100644 since NTFS does not support executable files. If the tree being checked out did have an executable file, we would erroneously decide that the file on disk had been changed.
Test that we can successfully force checkout a target when the file contents are identical, but the mode has changed.
4a59973 to
19e8fab
Compare
|
I cherry-picked these from #3839. I think that there's more work to do there, but this is nice and isolated and we should include it. /cc @cjhoward92 |
|
Looks good to me, thanks @ethomson. I've verified locally that the test actually catches the chmodded file with |
Merged
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 performing a forced checkout, treat files as modified when the workdir or the index is identical except for the mode. This ensures that force checkout will update the mode to the target.
Without this change, we examine the contents of the file on-disk and determine that it's identical to the tree we're checking out, and continue without making any changes. By including the filemode in the difference check, checkout will now make a file executable (or remove the executable bit) as appropriate to match the checkout target.
We apply this check for regular files only: in the case where one of the items was a file and the other item was not, then this would be a typechange (not a file mode change) and would be handled by other codepaths.