Petr Baudis <[EMAIL PROTECTED]> writes: > Yes. There were several discussions about this in the past, with no > clear outcome, IIRC. I would prefer: > > ~/.git/ignore per-user > /.git/ignore per-repository > .gitignore per-directory (cummulative with parent directories) > > Note that I also want to make use of some special characters in this > file ... to make it at least as powerful as CVS' ignore.
I'd like to extend "--exclude" and friends git-ls-files takes the following way (strawman). I'd appreciate your input from the perspective of Porcelain writers, and somebody who ends up having to use the bare Plumbing. I'll be sending patches for actual implementation in separate messages. ------------ 'git-ls-files' can use a list of "exclude patterns" when traversing the directory tree and finding files to show when the flags --others or --ignored are specified. These exclude patterns come from these places: (1) command line flag --exclude=<pattern> specifies a single pattern. (2) command line flag --exclude-from=<file> specifies a list of patterns stored in a file. (3) command line flag --exclude-per-directory=<name> specifies a name of the file in each directory 'git-ls-files' examines, and if exists, its contents are used as an additional list of patterns. An exclude pattern file used by (2) and (3) contains one pattern per line. A line that starts with a '#' can be used as comment for readability. The list of patterns that is in effect at a given time is built and ordered in the following way: * --exclude=<pattern> and lines read from --exclude-from=<file> come at the beginning of the list of patterns, in the order given on the command line. Patterns that come from the file specified with --exclude-from are ordered in the same order as they appear in the file. * When --exclude-per-directory=<name> is specified, upon entering a directory that has such a file, its contents are appended at the end of the current "list of patterns". They are popped off when leaving the directory. Each pattern in the pattern list specifies "a match pattern" and optionally the fate --- either a file that matches the pattern is considered excluded or included. By default, this being "exclude" mechanism, the fate is "excluded". A filename is examined against the patterns in the list, and the first match determines its fate. A pattern specified on the command line with --exclude or read from the file specified with --exclude-from is relative to the top of the directory tree. A pattern read from a file specified by --exclude-per-directory is relative to the directory that the pattern file appears in. An exclude pattern is of the following format: - an optional prefix '!' which means that the fate this pattern specifies is "include", not the usual "exclude"; the remainder of the pattern string is interpreted according to the following rules. - if it does not contain a slash '/', it is a shell glob pattern and used to match against the filename without leading directories (i.e. the same way as the current implementation). - otherwise, it is a shell glob pattern, suitable for consumption by fnmatch(3) with FNM_PATHNAME flag. I.e. a slash in the pattern must match a slash in the pathname. "Documentation/*.html" matches "Documentation/git.html" but not "ppc/ppc.html". As a natural exception, "/*.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c". An example: $ cat .git/ignore # ignore objects and archives, anywhere in the tree. *.[oa] $ cat Documentation/.gitignore # ignore generated html files, # except foo.html which is maintained by hand !foo.html *.html $ git-ls-files --ignored \ --exclude='Documentation/*.[0-9]' \ --exclude-from=.git/ignore \ --exclude-per-directory=.gitignore - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html