Skip to content

Renormalize line endings (match .gitattributes)#6874

Merged
dagood merged 1 commit intodotnet:masterfrom
dagood:renormalize-crlf
Jan 29, 2021
Merged

Renormalize line endings (match .gitattributes)#6874
dagood merged 1 commit intodotnet:masterfrom
dagood:renormalize-crlf

Conversation

@dagood
Copy link
Copy Markdown
Member

@dagood dagood commented Jan 29, 2021

A few files were checked in with CRLF endings rather than LF. This PR just runs git add --renormalize . to fix them up based on the .gitattributes line * text=auto encoding=UTF-8.

The bad line ending can cause a problem where a fresh clone of dotnet/arcade shows up as having changes. I think this has to do with Git version... it doesn't show up on my dev machine, but this is what happens on CentOS 7:

$ docker run -it --rm mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343 bash -c '
  set -x
  git clone https://github.com/dotnet/arcade
  cd arcade
  git status'

+ git clone https://github.com/dotnet/arcade
Cloning into 'arcade'...
remote: Enumerating objects: 119, done.
remote: Counting objects: 100% (119/119), done.
remote: Compressing objects: 100% (90/90), done.
remote: Total 38717 (delta 53), reused 48 (delta 28), pack-reused 38598
Receiving objects: 100% (38717/38717), 23.24 MiB | 18.30 MiB/s, done.
Resolving deltas: 100% (28396/28396), done.
+ cd arcade
+ git status
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   eng/publishing/v3/common-variables.yml
#       modified:   eng/publishing/v3/setup-maestro-vars.yml
#
no changes added to commit (use "git add" and/or "git commit -a")

@dagood dagood self-assigned this Jan 29, 2021
@dagood dagood requested a review from MattGal January 29, 2021 06:41
@dagood dagood merged commit fed18db into dotnet:master Jan 29, 2021
@dagood dagood deleted the renormalize-crlf branch January 29, 2021 16:46
akoeplinger pushed a commit to akoeplinger/arcade that referenced this pull request Apr 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants