Skip to content

Fix mixed line endings in Git#3497

Merged
mikkelbu merged 1 commit intomasterfrom
fix_line_endings
Mar 15, 2020
Merged

Fix mixed line endings in Git#3497
mikkelbu merged 1 commit intomasterfrom
fix_line_endings

Conversation

@jnm2
Copy link
Contributor

@jnm2 jnm2 commented Mar 7, 2020

Someone committed CRLF to the repository (they must have been on Windows and not had the typical core.autocrlf = true).

This results in VS prompts to fix mixed line endings if you edit any of these files, but VS then turns them all to CRLF which Git ignores when core.autocrlf = true. So the problem is never resolved.

Before this change: these files show up with primarily LF endings in new clones on Windows with core.autocrlf = true with a few CRLFs thrown in.

After this change: these files show up with CRLF endings in new clones on Windows with core.autocrlf = true.

Copy link
Member

@stevenaw stevenaw left a comment

Choose a reason for hiding this comment

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

Thanks @jnm2 this looks like a good change to have caught. I've tried filtering the PR to exclude whitespace and it shows that only whitespace changes have occurred (+ a BOM in ObjectToStringComparer ?). https://github.com/nunit/nunit/pull/3497/files?w=1

I'm not sure if I'm able to approve, but I don't see any issues with this as-is.

Copy link
Member

@mikkelbu mikkelbu left a comment

Choose a reason for hiding this comment

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

Like @stevenaw, I think this looks good.

@mikkelbu mikkelbu merged commit 0167a23 into master Mar 15, 2020
@mikkelbu mikkelbu deleted the fix_line_endings branch March 15, 2020 21:50
@mikkelbu mikkelbu added this to the 3.13 milestone Mar 15, 2020
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.

3 participants