Skip to content

microdev_micro_s2: Fix DOS line endings, they give my git fits #3330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2020

Conversation

jepler
Copy link

@jepler jepler commented Aug 26, 2020

My git (2.20.1 on debian buster) has a lot of trouble with the content of this file, due to DOS-style line endings. Even a fresh clone claims the file is modified!

jepler@rat:/tmp$ git clone https://github.com/adafruit/circuitpython
Cloning into 'circuitpython'...
remote: Enumerating objects: 113, done.
remote: Counting objects: 100% (113/113), done.
remote: Compressing objects: 100% (86/86), done.
remote: Total 129597 (delta 64), reused 56 (delta 24), pack-reused 129484
Receiving objects: 100% (129597/129597), 77.55 MiB | 43.44 MiB/s, done.
Resolving deltas: 100% (95682/95682), done.
jepler@rat:/tmp$ cd circuitpython/
jepler@rat:/tmp/circuitpython$ git status
On branch main
Your branch is up to date with 'origin/main'.

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:   ports/esp32s2/boards/microdev_micro_s2/sdkconfig

no changes added to commit (use "git add" and/or "git commit -a")

Add and commit the file, which causes it to be stored in git with unix-style line endings, like all our source files.

@dhalbert dhalbert self-requested a review August 26, 2020 16:04
@dhalbert
Copy link
Collaborator

@microdev1 Note there was a line-ending issue; we're fixing.

Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

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

Thank you!

@dhalbert dhalbert merged commit 4a682cd into adafruit:main Aug 26, 2020
@jepler jepler deleted the fix-line-endings branch November 3, 2021 21:09
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