fix: unmark scripts as binary files in .gitattributes #979
Conversation
This file contains 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
The current `.gitattributes` file marks all bash scripts as binary files, which prevents most `git` commands like `git diff` from working properly unless a `--text` argument is given, and entirely breaks the default merge strategy and conflict markers during manual merges. This was originally done to ensure bash scripts would keep their LF line-endings on Windows; however, this is better accomplished by the `text eol=lf` attributes instead. `text eol=lf` instructs git to always checkout specified text files with LF line-endings, regardless of what line-endings are considered 'native' on the current system. This commit changes the `binary` attribute to `text eol=lf` for shell scripts, continuing to ensure they are checked out with LF line-endings on Windows, while also allowing `git` utilities like `git diff`, `git log -p`, and merges to work as expected. Closes: mipopsgh-977
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.
This is an alternative to PR #977
The current
.gitattributesfile marks all bash scripts as binary files, which prevents mostgitcommands likegit difffrom working properly unless a--textargument is given, and entirely breaks the default merge strategy and conflict markers during manual merges.This was originally done to ensure bash scripts would keep their LF line-endings on Windows; however, this is better accomplished by the
text eol=lfattributes instead.text eol=lfinstructs git to always checkout specified text files with LF line-endings, regardless of what line-endings are considered 'native' on the current system.This commit changes the
binaryattribute totext eol=lffor shell scripts, continuing to ensure they are checked out with LF line-endings on Windows, while also allowinggitutilities likegit diff,git log -p, and merges to work as expected.Closes: gh-977