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

OSX.gitignore additions #1499

Closed
wants to merge 1 commit into from
Closed

OSX.gitignore additions #1499

wants to merge 1 commit into from

Conversation

Sduibek
Copy link

@Sduibek Sduibek commented May 2, 2015

Added __MACOSX folder and missing descriptions.

Added __MACOSX folder and missing descriptions.
@arcresu
Copy link
Contributor

arcresu commented May 3, 2015

Thanks, but could you explain what this rule is intended to fix? Is there any documentation?

@Sduibek
Copy link
Author

Sduibek commented Jun 19, 2015

Hello! I apologize for the delay in responding to this.

Well first of all I added a brief explanation/summary to entries that previously did not have any. Presumably this change is self-explanatory, no pun intended.

I couldn't find any explanations for .LSOverride via Google searches, hence why I added "?" as the explanation for that one. (I realize this probably isn't standard procedure but I wasn't sure what else to do there.)

Regarding the new entry, "__MACOSX/", it's a very common path on Mac systems with plentiful results if you do a web search for it. It only shows up on non-Mac systems, and is useless for non-Mac systems, hence the ignore entry.

It is involved with their handling of compressed archives:
http://superuser.com/questions/104500/what-is-macosx-folder
http://old.floatingsun.net/2007/02/07/whats-with-__macosx-in-zip-files/
http://www.quora.com/Why-do-Macs-create-a-__MACOSX-folder-in-a-zip-file
http://wpguru.co.uk/2013/10/how-to-remove-__macosx-from-zip-archives/
http://stackoverflow.com/questions/10924236/mac-zip-compress-without-macosx-folder

@DerekTurtleRoe
Copy link

@arcresu Can we merge this?

@shiftkey
Copy link
Member

I can't take this in as-is, as the line endings have changed and will regress this rule:

# Icon must end with two \r
Icon

cc @Sduibek

@DerekTurtleRoe
Copy link

This might sound stupid, but could you add a .gitignore to the .gitignore repo to normalize line endings? 😆

I mean, talk about meta, but it could work right?

@shiftkey
Copy link
Member

@vgturtle127 I don't think that will address the problem here, as it's been rather easy to break in the past #804

@DerekTurtleRoe
Copy link

Oh, the problem is simply with the Icon that needs two /r line endings in order to work?

We can probably remove that, or I can force the line endings in Notepad++.

Are line endings not normalized in this repository? If figured they would all be normalized into Unix format (or /LF as it is sometimes called)?

@shiftkey
Copy link
Member

Are line endings not normalized in this repository?

No, there is no .gitattributes file defined in this repository

@shiftkey
Copy link
Member

We can probably remove that, or I can force the line endings in Notepad++.

Me being rather lazy, I'd just edit the file on the site and create a new PR...

@DerekTurtleRoe
Copy link

@shiftkey I can do that if you want.

@shiftkey
Copy link
Member

@vgturtle127 let's close this out and start afresh

@shiftkey shiftkey closed this Jan 27, 2016
@DerekTurtleRoe
Copy link

@shiftkey So what do you want me to do? 😄

@shiftkey
Copy link
Member

@vgturtle127 that'd be great, I've got a lot of other things to review 😁

@DerekTurtleRoe
Copy link

@shiftkey What would be great? 😆

Do you want me to do a PR for all the Mac OS X stuff?

@shiftkey
Copy link
Member

@vgturtle127 sorry I wasn't clear enough. This is the interesting change from the original PR:

# Folder attributes
  .DS_Store
 +
 +# Resource Forks
 +__MACOSX/

@DerekTurtleRoe
Copy link

@shiftkey OK, just wanted to make sure I knew what I was doing. 😆

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants