Skip to content

say: change crlf line endings to lf#2103

Merged
andrerfcsantos merged 1 commit into
exercism:mainfrom
ee7:say-line-endings
Jun 3, 2022
Merged

say: change crlf line endings to lf#2103
andrerfcsantos merged 1 commit into
exercism:mainfrom
ee7:say-line-endings

Conversation

@ee7
Copy link
Copy Markdown
Member

@ee7 ee7 commented Apr 1, 2022

Commit 75fcd7b added a stub implementation to Say.java with crlf
line endings, and this repo's .gitattributes contains:

java/.gitattributes

Lines 4 to 5 in c2a6465

# Force the following filetypes to have unix eols, so Windows does not break them
*.* text eol=lf

which causes some problems. Resolve by changing line endings back to lf.

Before this commit:

$ git ls-files --eol | grep crlf
i/crlf  w/crlf  attr/text eol=lf      	exercises/practice/say/src/main/java/Say.java

With this commit:

$ git ls-files --eol | grep say
i/lf    w/lf    attr/text eol=lf      	exercises/practice/say/.docs/instructions.md
i/lf    w/lf    attr/text eol=lf      	exercises/practice/say/.meta/config.json
i/lf    w/lf    attr/text eol=lf      	exercises/practice/say/.meta/src/reference/java/Say.java
i/lf    w/lf    attr/text=auto        	exercises/practice/say/.meta/version
i/lf    w/lf    attr/text eol=lf      	exercises/practice/say/build.gradle
i/lf    w/lf    attr/text eol=lf      	exercises/practice/say/src/main/java/Say.java
i/lf    w/lf    attr/text eol=lf      	exercises/practice/say/src/test/java/SayTest.java

Closes: #2102


Reviewer Resources:

Track Policies


See e.g.

Commit 75fcd7b added a stub implementation to `Say.java` with crlf
line endings, and this repo's `.gitattributes` contains:

    # Force the following filetypes to have unix eols, so Windows does not break them
    *.* text eol=lf

which causes some problems. Resolve by changing line endings back to lf.

Before this commit:

    $ git ls-files --eol | grep crlf
    i/crlf  w/crlf  attr/text eol=lf      	exercises/practice/say/src/main/java/Say.java

With this commit:

    $ git ls-files --eol | grep say
    i/lf    w/lf    attr/text eol=lf      	exercises/practice/say/.docs/instructions.md
    i/lf    w/lf    attr/text eol=lf      	exercises/practice/say/.meta/config.json
    i/lf    w/lf    attr/text eol=lf      	exercises/practice/say/.meta/src/reference/java/Say.java
    i/lf    w/lf    attr/text=auto        	exercises/practice/say/.meta/version
    i/lf    w/lf    attr/text eol=lf      	exercises/practice/say/build.gradle
    i/lf    w/lf    attr/text eol=lf      	exercises/practice/say/src/main/java/Say.java
    i/lf    w/lf    attr/text eol=lf      	exercises/practice/say/src/test/java/SayTest.java

Closes: exercism#2102
@github-actions
Copy link
Copy Markdown
Contributor

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@donaldli2020
Copy link
Copy Markdown
Contributor

um

@andrerfcsantos andrerfcsantos added the x:size/small Small amount of work label Jun 3, 2022
Copy link
Copy Markdown
Member

@andrerfcsantos andrerfcsantos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this, well spotted.

Also thanks for the clear description of the PR :)

@andrerfcsantos andrerfcsantos merged commit 4c47631 into exercism:main Jun 3, 2022
@ee7 ee7 deleted the say-line-endings branch June 7, 2022 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

x:size/small Small amount of work

Projects

None yet

Development

Successfully merging this pull request may close these issues.

recent addition of crlf line endings

3 participants