Skip to content

JSPWIKI-1370 Fix the line endings of the working tree with a .gitattributes file - #635

Open
arturobernalg wants to merge 1 commit into
apache:masterfrom
arturobernalg:gitattributes-eol
Open

arturobernalg wants to merge 1 commit into
apache:masterfrom
arturobernalg:gitattributes-eol

Conversation

@arturobernalg

Copy link
Copy Markdown
Member

A checkout on Windows with core.autocrlf=true gives CRLF in the working tree, and a source release built from it has CRLF in the text files, including the shell scripts: in 3.0.1 RC1 and RC2, 1869 of 1900 text files, and woas.sh of the portable has a CR after the shebang. The files now have LF on every system, and the Windows scripts CRLF.

Run on this change: in a clone of master with core.autocrlf=true, 1597 text files had CRLF and woas.sh had 45; with this change woas.sh has none, woas.bat keeps CRLF, and git status is clean, in that clone and in one with core.autocrlf=input. mvn clean package from each of the two clones passes, and the woas.sh inside the portable zip has 45 CRLF when built from the clone without the file and 0 with it.

@spyhunter99

A checkout on Windows with core.autocrlf=true gave CRLF in the working tree, and a source release built from it had CRLF in the text files, including the shell scripts. The files now have LF in every system, and the Windows scripts CRLF.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant