Run git renormalize#5997
Merged
Merged
Conversation
This should fix `gradlew.bat` being show as `modified` even after a fresh git clone: ``` modified: extra/nouveau/gradlew.bat ``` That makes the dist tarball as "dirty" so it breaks our releases. This seems to happen because `extra/nouveau/gradlew.bat` was stored with cr/lf endings in git, but then we also modified `.gitattributes` to have `text eol=crlf`, which indicates we want to store the file with `lf` and only apply `cr/lf` after the checkout on Windows. So managed to thoroughly confuse git with that we wanted to do. It turns out we can fix this with `git add --renormalize .` so that's what this commit does [1]. [1] https://stackoverflow.com/questions/7156694/git-how-to-renormalize-line-endings-in-all-files-in-all-revisions
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
1 participant
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.
(Cherry-pick from main for 3.5.x git cherry-pick 0a50108)
This should fix
gradlew.batbeing show asmodifiedeven after a fresh git clone:That makes the dist tarball as "dirty" so it breaks our releases.
This seems to happen because
extra/nouveau/gradlew.batwas stored with cr/lf endings in git, but then we also modified.gitattributesto havetext eol=crlf, which indicates we want to store the file withlfand only applycr/lfafter the checkout on Windows. So managed to thoroughly confuse git with that we wanted to do.It turns out we can fix this with
git add --renormalize .so that's what this commit does [1].[1] https://stackoverflow.com/questions/7156694/git-how-to-renormalize-line-endings-in-all-files-in-all-revisions