DOS and Unix disagree on line endings in ASCII files. Git can work happily on top of it, but if there are more than one OS on the team it might change all of the line endings to the user OS format. This results in huge diffs -- this can be seen in #661970: Apply .clearfix to #header-group div and other collapsed elements.

In order to avoid this, the best practice is to set safecrlf = true in .gitconfig, but it will result in errors as Fusion files have mixed line endings. I have run dos2unix to every file in Fusion and I hope we can settle this once and for all.

CommentFileSizeAuthor
fusion-crlf-bug.patch432.89 KBbarraponto

Comments

barraponto’s picture

barraponto
he / him
commented

for what it's worth, i have run the following command:

find . -type f -exec dos2unix '{}' \;

using the dos2unix 5.2.1 utility from http://www.xs4all.nl/~waterlan/dos2unix.html

barraponto’s picture

barraponto
he / him
commented

and by the way, setting safecrlf = true in .gitconfig means it will automatically convert even if the user OS is using a different line ending.

aquariumtap’s picture

aquariumtap commented

Hi barraponto, I recently adjusted my git settings, so we should be moving to standard unix line endings gradually over the next couple of weeks.

Poieo’s picture

Poieo commented
Issue summary: View changes
Status: Needs review » Closed (fixed)
damienmckenna’s picture

damienmckenna
Location TN, USA
commented
Issue tags: -crlf +line endings