fix: remove bad .gitattributes#977
Conversation
|
@ElderOrb, can you remind me why we did this? |
|
IIRC this was a workaround for preserving EOL changes in a windows environment, but I don't think it's still needed. |
Right, it was done to avoid EOL auto-conversion on fetching changes into Windows-hosted git repo. It might be not needed or still needed, dependently on how Windows builds are produced. So makes sense to produce windows build from this PR and check if scripts are still functional |
|
I believe |
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
|
I have opened an alternative PR to replace I've marked both PRs as 'Closes:' each other, so if either is accepted the alternative will hopefully be cleaned up automatically. |
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.
g-maxime
force-pushed
the
bad_gitattributes
branch
from
b9c1ded to
2f8a214
Compare
4 participants
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.Closes: gh-979