The error message suggests that the script you’re invoking has embedded \r characters, which in turn suggests that it has Windows-style \r\n line endings instead of the \n-only line endings bash expects. As a quick fix, you can remove the \r chars. as follows: sed $’s/\r$//’ ./install.sh > ./install.Unix.sh Note: The $’…’ string is an … Read more
Q1 Enforcing consistent lineendings Q2 Enforcing at commit as well as checkout (comment) I’ll divide this into 2 parts: Practice and Principle Practice Expansion of code-apprentice’s suggestion Strictly avoid autocrlf — See why autocrlf is always wrong. And here for the core git devs arguing about the ill-thoughtout-ness of autocrlf. Note particularly that the implementor … Read more
The comment states // Determines what character(s) are used to terminate each line in new files. // Valid values are ‘system’ (whatever the OS uses), ‘windows’ (CRLF) and // ‘unix’ (LF only). You are setting “default_line_ending”: “LF”, You should set “default_line_ending”: “unix”,
For those using v2.16 or better, you can simply use: git add –renormalize . # Update index with renormalized files git status # Show the files that will be normalized git commit -m “Introduce end-of-line normalization” These directions are straight out of the gitattributes. For older versions, the docs (prior to v2.12) provide a different … Read more
It’s caused by the DOS/Windows line-ending characters. Like Andy Whitfield said, the Unix command dos2unix will help fix the problem. If you want more information, you can read the man pages for that command.
In Python 2.x, always open your file in binary mode, as documented. csv writes \r\n as you expected, but then the underlying Windows text file mechanism cuts in and changes that \n to \r\n … total effect: \r\r\n From the csv.writer documentation: If csvfile is a file object, it must be opened with the ‘b’ … Read more
You can use the file utility to give you an indication of the type of line endings. Unix: $ file testfile1.txt testfile.txt: ASCII text “DOS”: $ file testfile2.txt testfile2.txt: ASCII text, with CRLF line terminators To convert from “DOS” to Unix: $ dos2unix testfile2.txt To convert from Unix to “DOS”: $ unix2dos testfile1.txt Converting an … Read more
I would recommend, as I did in this SO question, to set it to false. If you can avoid modifying any eol (with your editor), then it would be best to push back your work with those eol unchanged (i.e. “as you found them”).
First, make sure you’re using the coloured output (e.g. with git diff –color) and that you’ve enabled whitespace highlighting with (e.g.) git config color.diff.whitespace “red reverse” This might not work in all cases, however, as git doesn’t appear to highlight trailing whitespace for removed lines. To see whitespace that you’ve deleted, simply use git diff … Read more
Update 2013: More recent git versions authorize using merge with strategy recursive and strategy option (-X): from “Git Merge and Fixing Mixed Spaces and Tabs with two Branches“: git merge -s recursive -Xignore-space-at-eol But using “-Xignore-space-change” is also a possibility Fab-V mentions below: git merge master -s recursive -X renormalize jakub.g also comments that the … Read more