-
Notifications
You must be signed in to change notification settings - Fork 558
Commit vendor/ with LF-style line endings #663
Conversation
@squillace @anhowe @colemickens To test, I did the following:
If either of y'all are on Windows, you can test by cloning/pulling, prereqs:
go get github.com/Masterminds/glide
go get github.com/jteeuwen/go-bindata/...
glide install |
Oh, and you'll need to configure Git to convert CRLF to LF on commit: just for this repo: globally (all projects you use git with) |
@acs-bot test this please |
1 similar comment
@acs-bot test this please |
How does this behave when you check it out in Linux? |
Didn't try Linux, though all *NIX OSes (Linux, macOS, etc.) use LF-style line endings. [edit]: and because they use LF-style endings, it will work fine on them. Sorry I left the key piece of info out. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, pulled the branch locally and in windows when I use the dockerfile like we ask devs to I had correct behavior.
Awesome. I confirmed Linux does the right thing too (just in case my neckbeard lore was flimsy): $ docker run --rm -it ubuntu bash
root@29a1767814c2:~ go get github.com/Azure/acs-engine && cd $GOPATH/src/github.com/Azure/acs-engine
root@29a1767814c2:~/go/src/github.com/Azure/acs-engine# git checkout fix-line-encodings
root@29a1767814c2:~/go/src/github.com/Azure/acs-engine# make prereqs
go get github.com/Masterminds/glide
go get github.com/jteeuwen/go-bindata/...
glide install
[INFO] Downloading dependencies. Please wait...
[INFO] --> Found desired version locally github.com/Azure/azure-sdk-for-go 5841475edc7c8725d79885d635aa8956f97fdf0e!
[INFO] --> Found desired version locally github.com/Azure/go-autorest 58f6f26e200fa5dfb40c9cd1c83f3e2c860d779d!
[INFO] --> Found desired version locally github.com/dgrijalva/jwt-go 6c8dedd55f8a2e41f605de6d5d66e51ed1f299fc!
...
root@29a1767814c2:~/go/src/github.com/Azure/acs-engine# git status
On branch fix-line-encodings
Your branch is up-to-date with 'origin/fix-line-encodings'.
nothing to commit, working directory clean |
CI timed out after nearly an hour. We'll fix this. Re-running again.
|
@acs-bot test this please |
What this PR does / why we need it:
vendor/
with LF-style line endings to ensurevendor/
doesn't change every timeglide install
is run on Windowsgit config --global core.autocrlf input
so git will automatically convert Windows-style CRLF endings to UNIX LF.Which issue this PR fixes
vendor/
was changing every time I ranmake prereqs
on macOS. This will commit + Windows devs settingcore.autocrlf=input
in their gitconfig should prevent noise.Special notes for your reviewer:
Release note:
This change is