Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix gitattributes file to treat *.rc & *.rc2 files as text #244

Merged
merged 2 commits into from
Aug 3, 2024

Conversation

stevewgr
Copy link
Member

@stevewgr stevewgr commented Aug 3, 2024

Description

Resolves: #243

Note that the bug in git's code triggers when adding the gitattributes configurations in an individual commit. The changes of gitattributes and renormalization of the affected files must occur within the same commit when modifying the .gitattributes file as described here: git-for-windows/git#5078 (comment)

Moving forward any changes to *.rc and *.rc2 files should properly render the diffs.

Also I explictly set some files as binary in the gitattributes file to hint git to not touch them when checking out files in the git's worktree or git index.

Also ensured all affected files are renormalized within the same commit
due to issues described in here:
git-for-windows/git#5078 (comment)
@stevewgr stevewgr self-assigned this Aug 3, 2024
@stevewgr
Copy link
Member Author

stevewgr commented Aug 3, 2024

Build passing without any issues 🎉: https://github.com/ko4life-net/ko/actions/runs/10225794695/job/28295256832

Merging.

@stevewgr stevewgr merged commit 91bd6b2 into master Aug 3, 2024
2 checks passed
@stevewgr stevewgr deleted the gitattributes-rc branch August 3, 2024 06:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

.gitattributes working-tree-encoding bugs with UTF-16 encoding
1 participant