Re:

On Wed, Mar 18, 2015 at 1:33 PM, Alessandro Zanardi <pensierinmusica@gmail.com> wrote:

I do not ship your ~/.gitignore_global file as part of my software, so the problem is not mine to fix in the first place ;-)

Where did you get that file from? We need to find whoever is responsible and notify them so that these users who are having the issue will be helped.

Thanks.

On Wed, Mar 18, 2015 at 1:45 PM, Junio C Hamano <gitster@pobox.com> wrote:

Maybe this can be understood as a critique on the .gitignore format specifier for paths. (Maybe not, I dunno)

So the `gitignore` script/executable which would generate your .gitignore file for you introduced a bug to also ignore files in "Icons/...." when all you wanted to have is ignoring the file "Icon\r\r" (Mind that \r is an escape character to explain the meaning, gitignore cannot understand it. Sometimes it also shows up as ^M^M depending on operating system/editor used.)

But as you can see, there have been several attempts at fixing it right and https://github.com/github/gitignore/pull/334 eventually got the right fix. (it was merged 2012, which has been a while now), maybe you'd want to use a new version of this gitignore script to regenerate your gitignore?

Given that this is part of https://github.com/github/gitignore which is the official collection of .gitignore files from Github, the company, we could ask Jeff or Michael if it is urgent. The actual fix being merged 3 years ago makes me belief it is not urgent though.

Thanks, Stefan

On Wed, Mar 18, 2015 at 02:06:22PM -0700, Stefan Beller wrote:

It looks like the fix they have in that repo does the right thing[1], but for reference, you are much more likely to get results by creating an issue or PR on that repository, rather than asking me.

-Peff

[1] The double-CR fix works because we strip a single CR from the end of
    the line (as a convenience for CRLF systems), and then the remaining
    CR is syntactically significant. But I am surprised that quoting
    like:

      printf '"Icon\r"' >.gitignore

    does not seem to work.

On Wed, Mar 18, 2015 at 05:17:16PM -0400, Jeff King wrote:

Answering myself: we don't do quoting like this in .gitignore. We allow backslashing to escape particular characters, like trailing whitespace. So in theory:

  Icon\\r

(where "\r" is a literal CR) would work. But it doesn't, because the CRLF chomping happens separately, and CR is therefore a special case. I suspect you could not .gitignore a file with a literal LF in it at all (and I equally suspect that nobody cares in practice).

-Peff

On Wed, Mar 18, 2015 at 2:28 PM, Jeff King <peff@peff.net> wrote:

What does the Icon^M try to catch, exactly? Is it a file? Is it a directory? Is it "anything that begins with Icon^M"?

I am wondering if we need an opposite of '/' prefix in the .gitignore file to say "the pattern does not match a directory, only a file".

On Wed, Mar 18, 2015 at 2:33 PM, Junio C Hamano <gitster@pobox.com> wrote:

It seems to be a special hidden file on Macs for UI convenience.