gitignore: ignore .DS_Store for macOS #14721

kfarnung · 2017-08-09T20:41:42Z

Porting upstream from nodejs/node-chakracore#363 on behalf of @tommyZZM.

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
commit message follows commit guidelines

Affected core subsystem(s)

gitignore

Fishrock123 · 2017-08-09T21:44:00Z

@tommyZZM Please add .DS_Store to your global gitignore. It belongs there rather than per project.

Fishrock123

I'm not sure why it didn't ignore properly, but we already ignore all dotfiles and whitelist the ones we need. Check the top of the file.

(This change in and of itself should not land.)

Fishrock123 · 2017-08-09T21:48:18Z

(Aside: duplicate of various past issues pre-whitelist: https://github.com/nodejs/node/pulls?q=is%3Apr+ds_store+is%3Aclosed)

Fishrock123 · 2017-08-09T21:49:22Z

Also, summoning @claudiorodriguez who wrote that patch: 15cc7c0

refack · 2017-08-09T21:51:55Z

@tommyZZM did you by any chance run git add . -A -f at some point?

kfarnung · 2017-08-09T22:36:23Z

Thanks @Fishrock123, it does seem like that should cover it, I'll ping @tommyZZM and try to get more information.

kfarnung · 2017-08-09T22:42:53Z

I see the issue now, the .DS_Store files are in the deps folder (from @tommyZZM in nodejs/node-chakracore#363):

node-chakracore$ git status
On branch master
Your branch is up-to-date with 'origin/master'.
Untracked files:
  (use "git add <file>..." to include in what will be committed

        .DS_Store
	chakrashim/.DS_Store
	npm/.DS_Store
	openssl/.DS_Store
	openssl/openssl/.DS_Store
	v8/.DS_Store
	v8/test/.DS_Store
	v8/test/mjsunit/.DS_Store
	../tools/eslint/.DS_Store
	../tools/eslint/node_modules/.DS_Store

Which makes sense given the commit that @Fishrock123 referenced, it explicitly allows all dotfiles in the deps directories:

!deps/**/.*

I'm personally not opposed to this change if it simplifies life for potential contributors, but as it stands this appears to be the intended behavior.

kfarnung · 2017-08-09T22:45:08Z

Looks like GitHub has a repo for that: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore

Fishrock123 · 2017-08-09T22:52:05Z

Ah, right. Ordinarily those folders do not need to be touched, so this isn't usually an issue.

I suggest making a refined whitelist for the chakrashim parts specifically and ignoring everything else. The other folders I think it is best to leave up to the end user, lest we repeat the never-ending-meta-file-ignoring again.

kfarnung · 2017-08-09T22:57:47Z

I'm starting to think that having a global .gitignore is the correct solution. Even refining using /deps/chakrashim/.gitignore wouldn't really help @tommyZZM since the files also show up under v8 and openssl.

Fishrock123 · 2017-08-09T23:11:57Z

IMO, if you edit the deps directly this is kinda on you.

kfarnung · 2017-08-11T00:56:58Z

I think the consensus was not to land this change, so let's just close the PR.

tommyZZM · 2017-08-12T02:33:30Z

hi @Fishrock123 @kfarnung

i have added .DS_Store to .gitignore_global with git config --global core.excludesfile

.gitignore_global

.DS_Store
*.DS_Store
**/.DS_Store

it works fine in other remotes , but not working in node and node-chakracore

my git version is 2.8.1, i tried update to 2.14.1, but still not get rid of .DS_Store

i found these rules may be the reason cause some .DS_Store not ignored

.gitignore

 # Whitelist dotfiles
 .*
-!deps/**/.*
-!test/fixtures/**/.*
-!tools/eslint/**/.*
-!tools/doc/node_modules/**/.*
+#!deps/**/.*
+#!test/fixtures/**/.*
+#!tools/eslint/**/.*
+#!tools/doc/node_modules/**/.*

i commented these lines and .DS_Stores are gone

then i tired may the most simplest modification is just add .DS_Store to .gitignore directly

.gitignore

+.DS_Store

and it works

JUST UPDATED

i found a solution without remove or add anything

the sequence of rules in #Whitelist dotfiles causes the problem 😄

.gitignore

# Whitelist dotfiles
-.*
!deps/**/.*
!test/fixtures/**/.*
!tools/eslint/**/.*
!tools/doc/node_modules/**/.*
!.editorconfig
!.eslintignore
!.eslintrc.yaml
!.gitattributes
!.github
!.gitignore
!.gitkeep
!.mailmap
!.remarkrc
+.*

move the .* to bottom solve the problem!

tommyZZM · 2017-08-12T04:50:14Z

hi @Fishrock123 @kfarnung

But modify sequence of rules will causes more problem

This overrides all the preceding rules. Previously, adding .foo to the test/fixtures directory would be reported by git, which is what we want. With this change, it will be ignored.

add .DS_Store at bottom may be better

# Whitelist dotfiles
.*
!deps/**/.*
!test/fixtures/**/.*
!tools/eslint/**/.*
!tools/doc/node_modules/**/.*
!.editorconfig
!.eslintignore
!.eslintrc.yaml
!.gitattributes
!.github
!.gitignore
!.gitkeep
!.mailmap
!.remarkrc
+.DS_Store

my current macOS(10.12.6) will auto generate .DS_Store without actually opening the folder. so this problem nervers me ...

i do not thing besides git clone the remote ,and then after some times reading code, git status will show this untracked changes of .DS_Stores

gibfahn · 2017-08-12T21:44:16Z

Yeah okay, this happens for me as well if I open up Finder and click around the deps/ subdirectories. I guess I've never done that before so didn't notice.

I suggest making a refined whitelist for the chakrashim parts specifically and ignoring everything else. The other folders I think it is best to leave up to the end user, lest we repeat the never-ending-meta-file-ignoring again.

I think @Fishrock123 's suggestion makes most sense. Ignore all dotfiles in deps/ except for a whitelist. Or if that's not feasible we could take the nuclear option of ignoring deps/ completely, and requiring people updating deps to use git add -f deps/.

@tommyZZM interesting that .DS_Store files get generated without you going into the folder, I'm on 10.12.6 as well, and I don't see that. Maybe your IDE is navigating into those folders or something.

tommyZZM · 2017-08-12T23:29:18Z

@gibfahn maybe some solfware (VisualStudioCore、SourceTree) make them get generated

refack · 2017-08-13T01:24:02Z

Y'all know about .git/info/exclude

gibfahn · 2017-08-13T01:49:03Z

Y'all know about .git/info/exclude

Doesn't local .gitignore take precedence over it? See docs: https://git-scm.com/docs/gitignore#_description

refack · 2017-08-13T22:17:03Z

Doesn't local .gitignore take precedence over it? See docs: https://git-scm.com/docs/gitignore#_description

Boop, read it upside down

xgqfrms-GitHub · 2019-03-16T02:04:14Z

.gitignore & .DS_Store

https://stackoverflow.com/questions/107701/how-can-i-remove-ds-store-files-from-a-git-repository

$ vi ~/.gitignore_global


# modify configs with below `ignore_macos.js` file

$ git config --global core.excludesfile ~/.gitignore_global

ignore_macos.js

# OS generated files #
######################
.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db

https://stackoverflow.com/questions/18393498/gitignore-all-the-ds-store-files-in-every-folder-and-subfolder

$ find . -name .DS_Store -print0 | xargs -0 git rm --ignore-unmatch

echo ".DS_Store" >> ~/.gitignore_global
echo "._.DS_Store" >> ~/.gitignore_global
echo "**/.DS_Store" >> ~/.gitignore_global
echo "**/._.DS_Store" >> ~/.gitignore_global

git config --global core.excludesfile ~/.gitignore_global

#Ignore folder mac
.DS_Store


# OR
.DS_Store
._.DS_Store
**/.DS_Store
**/._.DS_Store

gitignore: ignore .DS_Store for macOS

ba5c0e4

nodejs-github-bot added the meta Issues and PRs related to the general management of the project. label Aug 9, 2017

kfarnung mentioned this pull request Aug 9, 2017

test: update .gitignore with .DS_Store for macOS nodejs/node-chakracore#363

Closed

1 task

richardlau approved these changes Aug 9, 2017

View reviewed changes

refack approved these changes Aug 9, 2017

View reviewed changes

refack self-assigned this Aug 9, 2017

Fishrock123 suggested changes Aug 9, 2017

View reviewed changes

Fishrock123 added the duplicate Issues and PRs that are duplicates of other issues or PRs. label Aug 9, 2017

kfarnung closed this Aug 11, 2017

kfarnung deleted the pr363 branch August 11, 2017 00:57

tommyZZM mentioned this pull request Aug 12, 2017

gitignore: ignore .DS_Store for macOS #14779

Closed

2 tasks

Trott mentioned this pull request Oct 12, 2018

build: add .DS_store to .gitgnore #23554

Closed

refack removed their assignment Oct 20, 2018

refack added the stalled Issues and PRs that are stalled. label Mar 16, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gitignore: ignore .DS_Store for macOS #14721

gitignore: ignore .DS_Store for macOS #14721

kfarnung commented Aug 9, 2017 •

edited

Loading

Fishrock123 commented Aug 9, 2017 •

edited

Loading

Fishrock123 left a comment •

edited

Loading

Fishrock123 commented Aug 9, 2017

Fishrock123 commented Aug 9, 2017

refack commented Aug 9, 2017

kfarnung commented Aug 9, 2017

kfarnung commented Aug 9, 2017

kfarnung commented Aug 9, 2017

Fishrock123 commented Aug 9, 2017

kfarnung commented Aug 9, 2017

Fishrock123 commented Aug 9, 2017

kfarnung commented Aug 11, 2017

tommyZZM commented Aug 12, 2017 •

edited

Loading

tommyZZM commented Aug 12, 2017 •

edited

Loading

gibfahn commented Aug 12, 2017

tommyZZM commented Aug 12, 2017

refack commented Aug 13, 2017

gibfahn commented Aug 13, 2017

refack commented Aug 13, 2017

xgqfrms-GitHub commented Mar 16, 2019

gitignore: ignore .DS_Store for macOS #14721

gitignore: ignore .DS_Store for macOS #14721

Conversation

kfarnung commented Aug 9, 2017 • edited Loading

Checklist

Affected core subsystem(s)

Fishrock123 commented Aug 9, 2017 • edited Loading

Fishrock123 left a comment • edited Loading

Choose a reason for hiding this comment

Fishrock123 commented Aug 9, 2017

Fishrock123 commented Aug 9, 2017

refack commented Aug 9, 2017

kfarnung commented Aug 9, 2017

kfarnung commented Aug 9, 2017

kfarnung commented Aug 9, 2017

Fishrock123 commented Aug 9, 2017

kfarnung commented Aug 9, 2017

Fishrock123 commented Aug 9, 2017

kfarnung commented Aug 11, 2017

tommyZZM commented Aug 12, 2017 • edited Loading

tommyZZM commented Aug 12, 2017 • edited Loading

gibfahn commented Aug 12, 2017

tommyZZM commented Aug 12, 2017

refack commented Aug 13, 2017

gibfahn commented Aug 13, 2017

refack commented Aug 13, 2017

xgqfrms-GitHub commented Mar 16, 2019

.gitignore & .DS_Store

kfarnung commented Aug 9, 2017 •

edited

Loading

Fishrock123 commented Aug 9, 2017 •

edited

Loading

Fishrock123 left a comment •

edited

Loading

tommyZZM commented Aug 12, 2017 •

edited

Loading

tommyZZM commented Aug 12, 2017 •

edited

Loading