Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Added --whitespace=fix to git apply execution #811

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

Closed
crytt wants to merge 3 commits into coder:master from crytt:master
Closed

Added --whitespace=fix to git apply execution #811

crytt wants to merge 3 commits into coder:master from crytt:master

Conversation

@crytt
Copy link

@crytt crytt commented Jun 26, 2019

In order to prevent trailing whitespace errors on Windows.

Describe in detail the problem you had and how this PR fixes it

When running docker build . on Windows, I got a "trailing whitespace" error.

@deansheather suggested adding --whitespace=fix to the git apply execution, and it fixed the issue.

Is there an open issue you can link to?

#805

Copy link
Member

@deansheather deansheather left a comment

Choose a reason for hiding this comment

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

Looks good to me. Can you please amend this commit with valid author information (see below) and also sign it?

git config --global user.name "Name"
git config --global user.email "email@example.com"
git config --global user.signingkey ""
git commit --amend --gpg-sign --author="Name <email@example.com>"

Copy link
Member

@crytt bump

Copy link
Author

crytt commented Aug 5, 2019

@deansheather Sorry for the delay, summer and whatnot... Commit should now be signed.

Copy link
Contributor

sr229 commented Sep 12, 2019

Hey OP, I'll be closing this off, are you still working on this?

Copy link
Author

crytt commented Sep 13, 2019 via email

Close = no merge? I’m not really working on it. It was a small config fix in order to make the build pass on windows. It passed the build system first time, when I amended it with my git credentials I noticed the build did not pass, but I haven’t looked into why. Close it if you wanna, I’m not gonna fight for it 🙂
...
On 12 Sep 2019, at 20:01, Ayane Satomi ***@***.***> wrote: Hey OP, I'll be closing this off, are you still working on this? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub, or mute the thread.

Copy link
Contributor

nhooyr commented Sep 20, 2019

Very weird failure, git wasn't found. Will restart the build.

Copy link
Contributor

nhooyr commented Sep 20, 2019

Agreed with @sr229, lets just close this for now since V2 has different scripts/patches.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@deansheather deansheather deansheather requested changes

@code-asher code-asher Awaiting requested review from code-asher

@kylecarbs kylecarbs Awaiting requested review from kylecarbs

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

AltStyle によって変換されたページ (->オリジナル) /