From: Karsten Blees <karsten.blees@gmail.com>
To: pclouds@gmail.com
Cc: Git List <git@vger.kernel.org>,
alljeep@gmail.com, Jeff King <peff@peff.net>
Subject: Re: Feature Request: gitignore recursion
Date: Thu, 10 Oct 2013 09:59:38 +0200 [thread overview]
Message-ID: <52565E6A.2020907@gmail.com> (raw)
In-Reply-To: <20131007134141.GA23026@lanh>
> On Mon, Oct 07, 2013 at 07:24:11AM -0400, Jeff King wrote:
>> However, one thing I expected to work but didn't is:
>>
>> echo '*' >.gitignore
>> echo '!*' >my_dir/.gitignore
>>
>> That _does_ work for attributes, like:
>>
>> echo '* foo=one' >.gitattributes
>> echo '* foo=two' >my_dir/.gitattributes
>>
>> where the more-specific file takes precedence. It works because we keep
>> an attribute stack, and look from most-specific directory to least.
Note that this doesn't work either:
echo '*' >.gitignore
echo '!my_dir/*' >>.gitignore
The problem isn't that git doesn't read 'my_dir/.gitignore'. Git simply doesn't recurse into excluded directories, so patterns on excluded content have no effect.
IMO this behavior is reasonable, as there is no way to check whether a negative pattern will match within an excluded untracked directory without scanning the directory.
What about this instead?
--- 8< ---
Subject: [PATCH] gitignore.txt: clarify recursive nature of excluded directories
Additionally, precedence of negated patterns is exactly as outlined in
the description, we don't need to repeat this.
Signed-off-by: Karsten Blees <blees@dcon.de>
---
Documentation/gitignore.txt | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index f971960..a64a65d 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -79,8 +79,9 @@ PATTERN FORMAT
- An optional prefix "`!`" which negates the pattern; any
matching file excluded by a previous pattern will become
- included again. If a negated pattern matches, this will
- override lower precedence patterns sources.
+ included again. It is not possible to re-include a file if a parent
+ directory of that file is excluded (i.e. excluding a directory
+ will recursively and irrevocably exclude the entire content).
Put a backslash ("`\`") in front of the first "`!`" for patterns
that begin with a literal "`!`", for example, "`\!important!.txt`".
--
1.8.4.msysgit.1
next prev parent reply other threads:[~2013-10-10 7:59 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-06 22:23 Feature Request: gitignore recursion AJ
2013-10-07 10:26 ` Duy Nguyen
2013-10-07 11:24 ` Jeff King
2013-10-07 13:41 ` Duy Nguyen
2013-10-10 7:59 ` Karsten Blees [this message]
2013-10-10 16:22 ` Jeff King
2013-10-10 7:59 ` Karsten Blees
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52565E6A.2020907@gmail.com \
--to=karsten.blees@gmail.com \
--cc=alljeep@gmail.com \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).