{"thread":{"id":"22915","subject":"gitignore broken in git 1.7.0.1: slash checks leading dirs","startedAt":"2010-03-05T08:55:29Z","lastAt":"2010-03-10T10:25:51Z","messageCount":19,"participants":["Jiri Slaby","Johannes Sixt","Jakub Narebski","Jonathan Nieder","Junio C Hamano","Américo Wang","David Rientjes"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"136188","messageId":"4B90C701.3070308@gmail.com","threadId":"22915","inReplyTo":null,"subject":"gitignore broken in git 1.7.0.1: slash checks leading dirs","fromName":"Jiri Slaby","fromEmail":"jirislaby@gmail.com","sentAt":"2010-03-05T08:55:29Z","receivedAt":"2010-03-05T08:55:29Z","isPatch":false,"sender":{"key":"jirislaby@gmail.com","avatar":null},"body":"Hi,\n\nhaving 'linux' line in .gitignore makes 'include/linux/vga_switcheroo.h'\nto be ignored though the documentation says:\n***\nIf the pattern does not contain a slash /, git treats it as a shell\nglob pattern and checks for a match against the pathname without\nleading directories.\n***\n\n$ touch test\n$ touch include/linux/vga_asdads.h\n$ git ls-files -o --exclude-from=test\ninclude/linux/vga_asdads.h\ntest\n$ echo linux >test\n$ git ls-files -o --exclude-from=test\ntest\n\nThis does not happen with git 1.6.\n\nthanks,\n-- \njs\n"},{"id":"136190","messageId":"4B90C974.2050405@viscovery.net","threadId":"22915","inReplyTo":"4B90C701.3070308@gmail.com","subject":"Re: gitignore broken in git 1.7.0.1: slash checks leading dirs","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-03-05T09:05:56Z","receivedAt":"2010-03-05T09:05:56Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Jiri Slaby schrieb:\n> having 'linux' line in .gitignore makes 'include/linux/vga_switcheroo.h'\n> to be ignored\n\nThat's the behavior that I would expect.\n\n> though the documentation says:\n> ***\n> If the pattern does not contain a slash /, git treats it as a shell\n> glob pattern and checks for a match against the pathname without\n> leading directories.\n> ***\n\nand this citation confirms my expectation. Note that it says \"pathname\",\nnot \"filename\". 'include/linux' is a \"pathname\".\n\n-- Hannes\n"},{"id":"136191","messageId":"4B90C9BE.1030407@gmail.com","threadId":"22915","inReplyTo":"4B90C974.2050405@viscovery.net","subject":"Re: gitignore broken in git 1.7.0.1: slash checks leading dirs","fromName":"Jiri Slaby","fromEmail":"jirislaby@gmail.com","sentAt":"2010-03-05T09:07:10Z","receivedAt":"2010-03-05T09:07:10Z","isPatch":false,"sender":{"key":"jirislaby@gmail.com","avatar":null},"body":"On 03/05/2010 10:05 AM, Johannes Sixt wrote:\n> Jiri Slaby schrieb:\n>> having 'linux' line in .gitignore makes 'include/linux/vga_switcheroo.h'\n>> to be ignored\n> \n> That's the behavior that I would expect.\n> \n>> though the documentation says:\n>> ***\n>> If the pattern does not contain a slash /, git treats it as a shell\n>> glob pattern and checks for a match against the pathname without\n>> leading directories.\n>> ***\n> \n> and this citation confirms my expectation. Note that it says \"pathname\",\n> not \"filename\". 'include/linux' is a \"pathname\".\n\nWhat are 'leading directories' then?\n\n-- \njs\n"},{"id":"136192","messageId":"4B90CBE5.9090102@viscovery.net","threadId":"22915","inReplyTo":"4B90C9BE.1030407@gmail.com","subject":"Re: gitignore broken in git 1.7.0.1: slash checks leading dirs","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-03-05T09:16:21Z","receivedAt":"2010-03-05T09:16:21Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Jiri Slaby schrieb:\n> On 03/05/2010 10:05 AM, Johannes Sixt wrote:\n>> Jiri Slaby schrieb:\n>>> ***\n>>> If the pattern does not contain a slash /, git treats it as a shell\n>>> glob pattern and checks for a match against the pathname without\n>>> leading directories.\n>>> ***\n>> and this citation confirms my expectation. Note that it says \"pathname\",\n>> not \"filename\". 'include/linux' is a \"pathname\".\n> \n> What are 'leading directories' then?\n\n'include/' is the leading directory of 'include/linux'.\n\nThe cited sentence says that the particular check considers only the last\npath component of the pathname.\n\n-- Hannes\n"},{"id":"136195","messageId":"1267780845-10547-1-git-send-email-jslaby@suse.cz","threadId":"22915","inReplyTo":"4B90CBE5.9090102@viscovery.net","subject":"[PATCH 1/1] gitignore: do not ignore include/linux/","fromName":"Jiri Slaby","fromEmail":"jslaby@suse.cz","sentAt":"2010-03-05T09:20:45Z","receivedAt":"2010-03-05T09:20:45Z","isPatch":true,"sender":{"key":"jslaby@suse.cz","avatar":null},"body":"linux entry in .gitignore means that everything in include/linux/\ngets ignored with git 1.7.\n\nPrepend a slash to entries which are toplevel to avoid that\n\nSigned-off-by: Jiri Slaby <jslaby@suse.cz>\nCc: Johannes Sixt <j.sixt@viscovery.net>\n---\n .gitignore |   20 ++++++++++----------\n 1 files changed, 10 insertions(+), 10 deletions(-)\n\ndiff --git a/.gitignore b/.gitignore\nindex efab0eb..fe6ebb9 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -34,16 +34,16 @@ modules.builtin\n #\n # Top-level generic files\n #\n-tags\n-TAGS\n-linux\n-vmlinux\n-vmlinuz\n-System.map\n-Module.markers\n-Module.symvers\n-!.gitignore\n-!.mailmap\n+/tags\n+/TAGS\n+/linux\n+/vmlinux\n+/vmlinuz\n+/System.map\n+/Module.markers\n+/Module.symvers\n+!/.gitignore\n+!/.mailmap\n \n #\n # Generated include files\n-- \n1.7.0.1\n"},{"id":"136194","messageId":"4B90CEDD.6020106@gmail.com","threadId":"22915","inReplyTo":"4B90CBE5.9090102@viscovery.net","subject":"Re: gitignore broken in git 1.7.0.1: slash checks leading dirs","fromName":"Jiri Slaby","fromEmail":"jirislaby@gmail.com","sentAt":"2010-03-05T09:29:01Z","receivedAt":"2010-03-05T09:29:01Z","isPatch":false,"sender":{"key":"jirislaby@gmail.com","avatar":null},"body":"On 03/05/2010 10:16 AM, Johannes Sixt wrote:\n> The cited sentence says that the particular check considers only the last\n> path component of the pathname.\n\nThinking about it, there is no way to specify a *filename* no matter\nwhere it lies? I.e. patterns such as *.o matches also a/b/test.o/test.c?\nAm I missing something?\n\n-- \njs\n"},{"id":"136197","messageId":"m3pr3jkq26.fsf@localhost.localdomain","threadId":"22915","inReplyTo":"1267780845-10547-1-git-send-email-jslaby@suse.cz","subject":"Re: [PATCH 1/1] gitignore: do not ignore include/linux/","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2010-03-05T10:43:29Z","receivedAt":"2010-03-05T10:43:29Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Jiri Slaby <jslaby@suse.cz> writes:\n\n> linux entry in .gitignore means that everything in include/linux/\n> gets ignored with git 1.7.\n> \n> Prepend a slash to entries which are toplevel to avoid that\n> \n> Signed-off-by: Jiri Slaby <jslaby@suse.cz>\n> Cc: Johannes Sixt <j.sixt@viscovery.net>\n> ---\n>  .gitignore |   20 ++++++++++----------\n>  1 files changed, 10 insertions(+), 10 deletions(-)\n> \n> diff --git a/.gitignore b/.gitignore\n> index efab0eb..fe6ebb9 100644\n> --- a/.gitignore\n> +++ b/.gitignore\n> @@ -34,16 +34,16 @@ modules.builtin\n>  #\n>  # Top-level generic files\n>  #\n> -tags\n> -TAGS\n> -linux\n> -vmlinux\n> -vmlinuz\n> -System.map\n> -Module.markers\n> -Module.symvers\n> -!.gitignore\n> -!.mailmap\n> +/tags\n> +/TAGS\n> +/linux\n> +/vmlinux\n> +/vmlinuz\n> +/System.map\n> +/Module.markers\n> +/Module.symvers\n> +!/.gitignore\n> +!/.mailmap\n>  \n>  #\n>  # Generated include files\n\nActually you want to *not ignore* .gitignore and .mailmap (and\n.gitattributes which is missing here) anywhere, not only as top-level\nfile.  So .gitignore and .mailmap should not be prepended with slash.\n\n   #\n   # Top-level generic files\n   #\n  -tags\n  -TAGS\n  -linux\n  -vmlinux\n  -vmlinuz\n  -System.map\n  -Module.markers\n  -Module.symvers\n  +/tags\n  +/TAGS\n  +/linux\n  +/vmlinux\n  +/vmlinuz\n  +/System.map\n  +/Module.markers\n  +/Module.symvers\n   !.gitignore\n   !.mailmap\n\n\n-- \nJakub Narebski\nPoland\nShadeHawk on #git\n"},{"id":"136205","messageId":"20100305151248.GA24748@progeny.tock","threadId":"22915","inReplyTo":"4B90C974.2050405@viscovery.net","subject":"Re: gitignore broken in git 1.7.0.1: slash checks leading dirs","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-03-05T15:12:48Z","receivedAt":"2010-03-05T15:12:48Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Johannes Sixt wrote:\n> Jiri Slaby schrieb:\n\n>> having 'linux' line in .gitignore makes 'include/linux/vga_switcheroo.h'\n>> to be ignored\n>\n> That's the behavior that I would expect.\n>\n>> though the documentation says:\n>> ***\n>> If the pattern does not contain a slash /, git treats it as a shell\n>> glob pattern and checks for a match against the pathname without\n>> leading directories.\n>> ***\n>\n> and this citation confirms my expectation. Note that it says \"pathname\",\n> not \"filename\". 'include/linux' is a \"pathname\".\n\nIt would be more precise to say this citation does not have much to do\nwith it.  'include/linux' contains a slash, so that paragraph does not\ndescribe what it means.\n\nThe next paragraph is more on point:\n\n · Otherwise, git treats the pattern as a shell glob suitable for\n   consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the\n   pattern will not match a / in the pathname. For example,\n   \"Documentation/*.html\" matches \"Documentation/git.html\" but not\n   \"Documentation/ppc/ppc.html\". A leading slash matches the beginning of\n   the pathname; for example, \"/*.c\" matches \"cat-file.c\" but not\n   \"mozilla-sha1/sha1.c\".\n\nThe relevant sentence is the last one, and I can see how the length of the\nparagraph might be daunting.  Maybe splitting it up would help?\n\n · Otherwise, git treats the pattern as a shell glob suitable for\n   consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the\n   pattern will not match a / in the pathname. For example,\n   \"Documentation/*.html\" matches \"Documentation/git.html\" and\n   \"tools/perf/Documentation/perf-diff.html\" but not\n   \"Documentation/ppc/ppc.html\".\n\n · A leading slash matches the beginning of the pathname; for example,\n   \"/*.c\" matches \"cat-file.c\" but not \"mozilla-sha1/sha1.c\".\n\nNot sure.\n\nJonathan\n\n-- %< --\nSubject: gitignore.5: Clarify that path matches are not anchored\n\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\n---\n Documentation/gitignore.txt |   11 +++++++----\n 1 files changed, 7 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt\nindex 98c459d..fa15422 100644\n--- a/Documentation/gitignore.txt\n+++ b/Documentation/gitignore.txt\n@@ -89,10 +89,13 @@ Patterns have the following format:\n    for consumption by fnmatch(3) with the FNM_PATHNAME flag:\n    wildcards in the pattern will not match a / in the pathname.\n    For example, \"Documentation/\\*.html\" matches\n-   \"Documentation/git.html\" but not\n-   \"Documentation/ppc/ppc.html\".  A leading slash matches the\n-   beginning of the pathname; for example, \"/*.c\" matches\n-   \"cat-file.c\" but not \"mozilla-sha1/sha1.c\".\n+   \"Documentation/git.html\" and\n+   \"tools/perf/Documentation/perf-diff.html\" but not\n+   \"Documentation/ppc/ppc.html\".\n+\n+ - A leading slash matches the beginning of the pathname;\n+   for example, \"/*.c\" matches \"cat-file.c\" but not\n+   \"mozilla-sha1/sha1.c\".\n \n An example:\n \n-- \n1.7.0\n"},{"id":"136206","messageId":"20100305151553.GB24748@progeny.tock","threadId":"22915","inReplyTo":"20100305151248.GA24748@progeny.tock","subject":"Re: gitignore broken in git 1.7.0.1: slash checks leading dirs","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-03-05T15:15:53Z","receivedAt":"2010-03-05T15:15:53Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Jonathan Nieder wrote:\n> Johannes Sixt wrote:\n>> Jiri Slaby schrieb:\n>\n>>> having 'linux' line in .gitignore makes 'include/linux/vga_switcheroo.h'\n>>> to be ignored\n[...]\n>> and this citation confirms my expectation. Note that it says \"pathname\",\n>> not \"filename\". 'include/linux' is a \"pathname\".\n>\n> It would be more precise to say this citation does not have much to do\n> with it.  'include/linux' contains a slash, so that paragraph does not\n> describe what it means.\n\nCurse my quick reading.  Sorry for the nonsense, please ignore.\n\nMy suggested patch still might make sense, though. :)\n\nJonathan\n"},{"id":"136207","messageId":"4B9120F2.2020000@gmail.com","threadId":"22915","inReplyTo":"m3pr3jkq26.fsf@localhost.localdomain","subject":"Re: [PATCH 1/1] gitignore: do not ignore include/linux/","fromName":"Jiri Slaby","fromEmail":"jirislaby@gmail.com","sentAt":"2010-03-05T15:19:14Z","receivedAt":"2010-03-05T15:19:14Z","isPatch":true,"sender":{"key":"jirislaby@gmail.com","avatar":null},"body":"On 03/05/2010 11:43 AM, Jakub Narebski wrote:\n>> +!/.gitignore\n>> +!/.mailmap\n> \n> Actually you want to *not ignore* .gitignore and .mailmap (and\n> .gitattributes which is missing here) anywhere, not only as top-level\n> file.  So .gitignore and .mailmap should not be prepended with slash.\n\n<and moved out of the 'Top-level generic files' section then>\n\n-- \njs\n"},{"id":"136208","messageId":"4B912469.8060705@viscovery.net","threadId":"22915","inReplyTo":"20100305151248.GA24748@progeny.tock","subject":"Re: gitignore broken in git 1.7.0.1: slash checks leading dirs","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2010-03-05T15:34:01Z","receivedAt":"2010-03-05T15:34:01Z","isPatch":false,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Jonathan Nieder schrieb:\n>  · Otherwise, git treats the pattern as a shell glob suitable for\n>    consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the\n>    pattern will not match a / in the pathname. For example,\n>    \"Documentation/*.html\" matches \"Documentation/git.html\" and\n>    \"tools/perf/Documentation/perf-diff.html\" but not\n>    \"Documentation/ppc/ppc.html\".\n\nThis is not correct: When the pattern \"Documentation/*.html\" matches\n\"Documentation/git.html\", then it cannot match\n\"tools/perf/Documentation/perf-diff.html\". This is because patterns that\ncontain a slash (after stripping a trailing slash) are anchored at the\ndirectory that contains the .gitignore.\n\nSaid pattern would match the latter name only if it appeared in\ntools/perf/.gitignore (but in this case it wouldn't match the former name,\nof course).\n\n-- Hannes\n"},{"id":"136209","messageId":"20100305155639.GA25080@progeny.tock","threadId":"22915","inReplyTo":"4B912469.8060705@viscovery.net","subject":"[PATCH] gitignore.5: Clarify matching rules","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-03-05T15:56:39Z","receivedAt":"2010-03-05T15:56:39Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Patterns containing a / are implicitly anchored to the directory\ncontaining the relevant .gitignore file.\n\nPatterns not containing a / are textual matches against the path\nname relative to the directory containing .gitignore.\n\nSigned-off-by: Jonathan Nieder <jrnieder@gmail.com>\n---\nJohannes Sixt wrote:\n\n> When the pattern \"Documentation/*.html\" matches\n> \"Documentation/git.html\", then it cannot match\n> \"tools/perf/Documentation/perf-diff.html\". This is because patterns that\n> contain a slash (after stripping a trailing slash) are anchored at the\n> directory that contains the .gitignore.\n\nOh!  The documentation could definitely use clarification here.\n\nThanks.\n\n Documentation/gitignore.txt |   14 +++++++++-----\n 1 files changed, 9 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt\nindex 98c459d..e10fa88 100644\n--- a/Documentation/gitignore.txt\n+++ b/Documentation/gitignore.txt\n@@ -83,16 +83,20 @@ Patterns have the following format:\n \n  - If the pattern does not contain a slash '/', git treats it as\n    a shell glob pattern and checks for a match against the\n-   pathname without leading directories.\n+   pathname relative to the location of the `.gitignore` file\n+   (relative to the toplevel of the work tree if not from a\n+   `.gitignore` file).\n \n  - Otherwise, git treats the pattern as a shell glob suitable\n    for consumption by fnmatch(3) with the FNM_PATHNAME flag:\n    wildcards in the pattern will not match a / in the pathname.\n    For example, \"Documentation/\\*.html\" matches\n-   \"Documentation/git.html\" but not\n-   \"Documentation/ppc/ppc.html\".  A leading slash matches the\n-   beginning of the pathname; for example, \"/*.c\" matches\n-   \"cat-file.c\" but not \"mozilla-sha1/sha1.c\".\n+   \"Documentation/git.html\" but not \"Documentation/ppc/ppc.html\"\n+   or \"tools/perf/Documentation/perf.html\".\n+\n+ - A leading slash matches the beginning of the pathname.\n+   For example, \"/*.c\" matches \"cat-file.c\" but not\n+   \"mozilla-sha1/sha1.c\".\n \n An example:\n \n-- \n1.7.0\n"},{"id":"136212","messageId":"7vhbou1z4z.fsf@alter.siamese.dyndns.org","threadId":"22915","inReplyTo":"4B90C974.2050405@viscovery.net","subject":"Re: gitignore broken in git 1.7.0.1: slash checks leading dirs","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-03-05T17:01:16Z","receivedAt":"2010-03-05T17:01:16Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Sixt <j.sixt@viscovery.net> writes:\n\n> Jiri Slaby schrieb:\n>> having 'linux' line in .gitignore makes 'include/linux/vga_switcheroo.h'\n>> to be ignored\n>\n> That's the behavior that I would expect.\n\nAlso the initial report made it sound as if there were a regression, but\nit doesn't seem to be the case; I don't see it behaving any differently\namong 1.7.0, 1.7.0.1, 1.6.0, 1.6.6, or even 1.5.4.\n"},{"id":"136214","messageId":"20100305172549.GA28562@progeny.tock","threadId":"22915","inReplyTo":"4B90CEDD.6020106@gmail.com","subject":"Re: gitignore broken in git 1.7.0.1: slash checks leading dirs","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2010-03-05T17:25:49Z","receivedAt":"2010-03-05T17:25:49Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Jiri Slaby wrote:\n\n> Thinking about it, there is no way to specify a *filename* no matter\n> where it lies? I.e. patterns such as *.o matches also a/b/test.o/test.c?\n> Am I missing something?\n\nIs\n\n *.o\n !*.o/\n\nwhat you are looking for?  The first line matches *.o anywhere, and\nthe second matches *.o anywhere as long as it is a directory.\n"},{"id":"136219","messageId":"4B915BEF.1030201@gmail.com","threadId":"22915","inReplyTo":"20100305172549.GA28562@progeny.tock","subject":"Re: gitignore broken in git 1.7.0.1: slash checks leading dirs","fromName":"Jiri Slaby","fromEmail":"jirislaby@gmail.com","sentAt":"2010-03-05T19:30:55Z","receivedAt":"2010-03-05T19:30:55Z","isPatch":false,"sender":{"key":"jirislaby@gmail.com","avatar":null},"body":"On 03/05/2010 06:25 PM, Jonathan Nieder wrote:\n> Jiri Slaby wrote:\n> \n>> Thinking about it, there is no way to specify a *filename* no matter\n>> where it lies? I.e. patterns such as *.o matches also a/b/test.o/test.c?\n>> Am I missing something?\n> \n> Is\n> \n>  *.o\n>  !*.o/\n> \n> what you are looking for?  The first line matches *.o anywhere, and\n> the second matches *.o anywhere as long as it is a directory.\n\nAs I wrote above, *.o also matches against a/b/test.o/test.c, correct?\n"},{"id":"136372","messageId":"2375c9f91003071808n64bf5ddav4a5eeb6e73158d4@mail.gmail.com","threadId":"22915","inReplyTo":"1267780845-10547-1-git-send-email-jslaby@suse.cz","subject":"Re: [PATCH 1/1] gitignore: do not ignore include/linux/","fromName":"Américo Wang","fromEmail":"xiyou.wangcong@gmail.com","sentAt":"2010-03-08T02:08:46Z","receivedAt":"2010-03-08T02:08:46Z","isPatch":true,"sender":{"key":"xiyou.wangcong@gmail.com","avatar":null},"body":"On Fri, Mar 5, 2010 at 5:20 PM, Jiri Slaby <jslaby@suse.cz> wrote:\n> linux entry in .gitignore means that everything in include/linux/\n> gets ignored with git 1.7.\n>\n> Prepend a slash to entries which are toplevel to avoid that\n\nNew change in git 1.7?\n"},{"id":"136495","messageId":"alpine.DEB.2.00.1003100205170.17698@chino.kir.corp.google.com","threadId":"22915","inReplyTo":"4B9120F2.2020000@gmail.com","subject":"Re: [PATCH 1/1] gitignore: do not ignore include/linux/","fromName":"David Rientjes","fromEmail":"rientjes@google.com","sentAt":"2010-03-10T10:07:08Z","receivedAt":"2010-03-10T10:07:08Z","isPatch":true,"sender":{"key":"rientjes@google.com","avatar":null},"body":"On Fri, 5 Mar 2010, Jiri Slaby wrote:\n\n> On 03/05/2010 11:43 AM, Jakub Narebski wrote:\n> >> +!/.gitignore\n> >> +!/.mailmap\n> > \n> > Actually you want to *not ignore* .gitignore and .mailmap (and\n> > .gitattributes which is missing here) anywhere, not only as top-level\n> > file.  So .gitignore and .mailmap should not be prepended with slash.\n> \n> <and moved out of the 'Top-level generic files' section then>\n> \n\nPlease either revert 3b2a8c8f3c65 or merge the fixed up patch for \n2.6.34-rc2, otherwise include/linux will continue to be ignored by git \njust like it is for 2.6.34-rc1.\n"},{"id":"136486","messageId":"2375c9f91003100211vbe66a49g1bec37b2dcf609c2@mail.gmail.com","threadId":"22915","inReplyTo":"alpine.DEB.2.00.1003100205170.17698@chino.kir.corp.google.com","subject":"Re: [PATCH 1/1] gitignore: do not ignore include/linux/","fromName":"Américo Wang","fromEmail":"xiyou.wangcong@gmail.com","sentAt":"2010-03-10T10:11:38Z","receivedAt":"2010-03-10T10:11:38Z","isPatch":true,"sender":{"key":"xiyou.wangcong@gmail.com","avatar":null},"body":"On Wed, Mar 10, 2010 at 6:07 PM, David Rientjes <rientjes@google.com> wrote:\n> On Fri, 5 Mar 2010, Jiri Slaby wrote:\n>\n>> On 03/05/2010 11:43 AM, Jakub Narebski wrote:\n>> >> +!/.gitignore\n>> >> +!/.mailmap\n>> >\n>> > Actually you want to *not ignore* .gitignore and .mailmap (and\n>> > .gitattributes which is missing here) anywhere, not only as top-level\n>> > file.  So .gitignore and .mailmap should not be prepended with slash.\n>>\n>> <and moved out of the 'Top-level generic files' section then>\n>>\n>\n> Please either revert 3b2a8c8f3c65 or merge the fixed up patch for\n> 2.6.34-rc2, otherwise include/linux will continue to be ignored by git\n> just like it is for 2.6.34-rc1.\n\nWhy not apply the patch from Jiri? Since this problem is introduced\nby new version of git, not that commit.\n"},{"id":"136488","messageId":"alpine.DEB.2.00.1003100223090.30021@chino.kir.corp.google.com","threadId":"22915","inReplyTo":"2375c9f91003100211vbe66a49g1bec37b2dcf609c2@mail.gmail.com","subject":"Re: [PATCH 1/1] gitignore: do not ignore include/linux/","fromName":"David Rientjes","fromEmail":"rientjes@google.com","sentAt":"2010-03-10T10:25:51Z","receivedAt":"2010-03-10T10:25:51Z","isPatch":true,"sender":{"key":"rientjes@google.com","avatar":null},"body":"On Wed, 10 Mar 2010, Américo Wang wrote:\n\n> >> >> +!/.gitignore\n> >> >> +!/.mailmap\n> >> >\n> >> > Actually you want to *not ignore* .gitignore and .mailmap (and\n> >> > .gitattributes which is missing here) anywhere, not only as top-level\n> >> > file.  So .gitignore and .mailmap should not be prepended with slash.\n> >>\n> >> <and moved out of the 'Top-level generic files' section then>\n> >>\n> >\n> > Please either revert 3b2a8c8f3c65 or merge the fixed up patch for\n> > 2.6.34-rc2, otherwise include/linux will continue to be ignored by git\n> > just like it is for 2.6.34-rc1.\n> \n> Why not apply the patch from Jiri? Since this problem is introduced\n> by new version of git, not that commit.\n> \n\nLike I said, please either revert the commit that added \"linux\" to \n.gitignore or merge Jiri's patch.  I'm not interested in engaging in a \ndiscussion about what can or cannot be merged during rc cycles, I just \nhope this is resolved for rc2."}]}