Skip to content
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

Update gitignore #536

Merged
merged 1 commit into from
Feb 16, 2018
Merged

Update gitignore #536

merged 1 commit into from
Feb 16, 2018

Conversation

thaJeztah
Copy link
Member

Adding some lines from the Moby gitignore

@dnephin @vdemeester for consideration; not sure if these would qualify as "should be present in your global ignore" as well

@codecov-io
Copy link

codecov-io commented Sep 15, 2017

Codecov Report

Merging #536 into master will increase coverage by <.01%.
The diff coverage is n/a.

@@            Coverage Diff            @@
##           master    #536      +/-   ##
=========================================
+ Coverage    49.4%   49.4%   +<.01%     
=========================================
  Files         208     208              
  Lines       17159   17159              
=========================================
+ Hits         8477    8478       +1     
+ Misses       8249    8248       -1     
  Partials      433     433

Copy link
Collaborator

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

.gitignore Outdated
.DS_Store
Thumbs.db
# a .bashrc may be added to customize the build environment
.bashrc
Copy link
Collaborator

Choose a reason for hiding this comment

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

The custom .bashrc only works in the context of the moby/moby build scripts: https://github.com/moby/moby/blob/master/Dockerfile#L179. There's no corresponding feature in this repo.

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, yes, makes sense, I can remove that, thanks 👍

Adding some lines from the Moby gitignore

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Member Author

Updated, PTAL 😅

Copy link
Contributor

@dnephin dnephin left a comment

Choose a reason for hiding this comment

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

None of these files are created by this repo, or they are already ignored by other rules (ex .exe should be in build/

I guess we could add these, but why?

@thaJeztah
Copy link
Member Author

To prevent things like #535

@vdemeester
Copy link
Collaborator

@dnephin @thaJeztah what is the current status of this ? 👼

@dnephin
Copy link
Contributor

dnephin commented Jan 26, 2018

I think generally .gitignore should only include files that are created by a project, or are documented by the project, but should not be added to git. Other files should be ignored by the user.

I don't think adding these lines fixes the problem.

@vdemeester
Copy link
Collaborator

@dnephin although I agree, part of them can be created by the project (*.exe, the file ending with ~ or *.swp when editing with vim or else, …) and I really think it doesn't really hurt to add them…

… and the PR is stuck since September, it's creeping me out. So I'll go ahead and merge it and if we feel something wrong with it we can remove some of them 👼

@vdemeester vdemeester merged commit 2001500 into docker:master Feb 16, 2018
@GordonTheTurtle GordonTheTurtle added this to the 18.03.0 milestone Feb 16, 2018
@thaJeztah thaJeztah deleted the update-gitignore branch February 16, 2018 09:44
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.

6 participants