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

enhance: add .DS_Store ignore #1724

Merged
merged 1 commit into from
Jul 12, 2018

Conversation

frank-zsy
Copy link
Contributor

Ⅰ. Describe what this PR did

Add .DS_Store file ignore pattern in .gitignore to prevent contributor commit these files.

Ⅱ. Does this pull request fix one issue?

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

@pouchrobot
Copy link
Collaborator

@Frankzhaopku Thanks for your contribution. 🍻
Please sign off in each of your commits.

@@ -8,3 +8,4 @@ coverage.txt
.editorconfig
.bashrc
.idea
.DS_Store
Copy link
Contributor

Choose a reason for hiding this comment

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

*/.DS_Store is better for any dir in the root. WDTY?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@fuweid Actually .DS_Store already ignored all the files in sub directories, if this is what you mean.

Copy link
Contributor

Choose a reason for hiding this comment

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

👌 LGTM

@codecov-io
Copy link

Codecov Report

Merging #1724 into master will decrease coverage by 0.05%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #1724      +/-   ##
=========================================
- Coverage   41.26%   41.2%   -0.06%     
=========================================
  Files         274     274              
  Lines       18123   18123              
=========================================
- Hits         7478    7468      -10     
- Misses       9733    9740       +7     
- Partials      912     915       +3
Impacted Files Coverage Δ
apis/server/server.go 43.37% <0%> (-4.82%) ⬇️
ctrd/image.go 75.27% <0%> (-2.2%) ⬇️
daemon/logger/jsonfile/utils.go 71.54% <0%> (-1.63%) ⬇️

@fuweid fuweid merged commit 73d80dd into AliyunContainerService:master Jul 12, 2018
@frank-zsy frank-zsy deleted the add-ignore-mac-file branch July 13, 2018 02:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants