From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 May 2013 21:23:39 +0000 (-0700)
Subject: Merge branch 'as/check-ignore'
X-Git-Tag: v1.8.4-rc0~252
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c51afbbd18f51beb186afdfa8bbe35c13a782df7?hp=-c

Merge branch 'as/check-ignore'

Enhance "check-ignore" (1.8.2 update) to work more like "check-attr"
over bidi-pipes.

* as/check-ignore:
t0008: use named pipe (FIFO) to test check-ignore streaming
Documentation: add caveats about I/O buffering for check-{attr,ignore}
check-ignore: allow incremental streaming of queries via --stdin
check-ignore: move setup into cmd_check_ignore()
check-ignore: add -n / --non-matching option
t0008: remove duplicated test fixture data
---

c51afbbd18f51beb186afdfa8bbe35c13a782df7
diff --combined Documentation/git.txt
index 9e302b0a60,122b33f066..65de534e43
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -22,63 -22,28 +22,63 @@@ unusually rich command set that provide
  and full access to internals.
  
  See linkgit:gittutorial[7] to get started, then see
 -link:everyday.html[Everyday Git] for a useful minimum set of commands, and
 -"man git-commandname" for documentation of each command.  CVS users may
 -also want to read linkgit:gitcvs-migration[7].  See
 -the link:user-manual.html[Git User's Manual] for a more in-depth
 -introduction.
 +link:everyday.html[Everyday Git] for a useful minimum set of
 +commands.  The link:user-manual.html[Git User's Manual] has a more
 +in-depth introduction.
  
 -The '<command>' is either a name of a Git command (see below) or an alias
 -as defined in the configuration file (see linkgit:git-config[1]).
 +After you mastered the basic concepts, you can come back to this
 +page to learn what commands Git offers.  You can learn more about
 +individual Git commands with "git help command".  linkgit:gitcli[7]
 +manual page gives you an overview of the command line command syntax.
  
 -Formatted and hyperlinked version of the latest git
 -documentation can be viewed at
 -`http://www.kernel.org/pub/software/scm/git/docs/`.
 +Formatted and hyperlinked version of the latest Git documentation
 +can be viewed at `http://git-htmldocs.googlecode.com/git/git.html`.
  
  ifdef::stalenotes[]
  [NOTE]
  ============
  
  You are reading the documentation for the latest (possibly
 -unreleased) version of git, that is available from 'master'
 +unreleased) version of Git, that is available from 'master'
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v1.8.2.3/git.html[documentation for release 1.8.2.3]
 +
 +* release notes for
 +  link:RelNotes/1.8.2.3.txt[1.8.2.3].
 +  link:RelNotes/1.8.2.2.txt[1.8.2.2].
 +  link:RelNotes/1.8.2.1.txt[1.8.2.1].
 +  link:RelNotes/1.8.2.txt[1.8.2].
 +
 +* link:v1.8.1.6/git.html[documentation for release 1.8.1.6]
 +
 +* release notes for
 +  link:RelNotes/1.8.1.6.txt[1.8.1.6],
 +  link:RelNotes/1.8.1.5.txt[1.8.1.5],
 +  link:RelNotes/1.8.1.4.txt[1.8.1.4],
 +  link:RelNotes/1.8.1.3.txt[1.8.1.3],
 +  link:RelNotes/1.8.1.2.txt[1.8.1.2],
 +  link:RelNotes/1.8.1.1.txt[1.8.1.1],
 +  link:RelNotes/1.8.1.txt[1.8.1].
 +
 +* link:v1.8.0.3/git.html[documentation for release 1.8.0.3]
 +
 +* release notes for
 +  link:RelNotes/1.8.0.3.txt[1.8.0.3],
 +  link:RelNotes/1.8.0.2.txt[1.8.0.2],
 +  link:RelNotes/1.8.0.1.txt[1.8.0.1],
 +  link:RelNotes/1.8.0.txt[1.8.0].
 +
 +* link:v1.7.12.4/git.html[documentation for release 1.7.12.4]
 +
 +* release notes for
 +  link:RelNotes/1.7.12.4.txt[1.7.12.4],
 +  link:RelNotes/1.7.12.3.txt[1.7.12.3],
 +  link:RelNotes/1.7.12.2.txt[1.7.12.2],
 +  link:RelNotes/1.7.12.1.txt[1.7.12.1],
 +  link:RelNotes/1.7.12.txt[1.7.12].
 +
  * link:v1.7.11.7/git.html[documentation for release 1.7.11.7]
  
  * release notes for
@@@ -368,12 -333,12 +368,12 @@@ endif::stalenotes[
  OPTIONS
  -------
  --version::
 -	Prints the git suite version that the 'git' program came from.
 +	Prints the Git suite version that the 'git' program came from.
  
  --help::
  	Prints the synopsis and a list of the most commonly used
  	commands. If the option '--all' or '-a' is given then all
 -	available commands are printed. If a git command is named this
 +	available commands are printed. If a Git command is named this
  	option will bring up the manual page for that command.
  +
  Other options are available to control how the manual page is
@@@ -388,22 -353,22 +388,22 @@@ help ...`
  	'git config' (subkeys separated by dots).
  
  --exec-path[=<path>]::
 -	Path to wherever your core git programs are installed.
 +	Path to wherever your core Git programs are installed.
  	This can also be controlled by setting the GIT_EXEC_PATH
  	environment variable. If no path is given, 'git' will print
  	the current setting and then exit.
  
  --html-path::
 -	Print the path, without trailing slash, where git's HTML
 +	Print the path, without trailing slash, where Git's HTML
  	documentation is installed and exit.
  
  --man-path::
  	Print the manpath (see `man(1)`) for the man pages for
 -	this version of git and exit.
 +	this version of Git and exit.
  
  --info-path::
  	Print the path where the Info files documenting this
 -	version of git are installed and exit.
 +	version of Git are installed and exit.
  
  -p::
  --paginate::
@@@ -413,7 -378,7 +413,7 @@@
  	below).
  
  --no-pager::
 -	Do not pipe git output into a pager.
 +	Do not pipe Git output into a pager.
  
  --git-dir=<path>::
  	Set the path to the repository. This can also be controlled by
@@@ -429,7 -394,7 +429,7 @@@
  	more detailed discussion).
  
  --namespace=<path>::
 -	Set the git namespace.  See linkgit:gitnamespaces[7] for more
 +	Set the Git namespace.  See linkgit:gitnamespaces[7] for more
  	details.  Equivalent to setting the `GIT_NAMESPACE` environment
  	variable.
  
@@@ -439,19 -404,32 +439,19 @@@
  	directory.
  
  --no-replace-objects::
 -	Do not use replacement refs to replace git objects. See
 +	Do not use replacement refs to replace Git objects. See
  	linkgit:git-replace[1] for more information.
  
 +--literal-pathspecs::
 +	Treat pathspecs literally, rather than as glob patterns. This is
 +	equivalent to setting the `GIT_LITERAL_PATHSPECS` environment
 +	variable to `1`.
  
 -FURTHER DOCUMENTATION
 ----------------------
 -
 -See the references above to get started using git.  The following is
 -probably more detail than necessary for a first-time user.
 -
 -The link:user-manual.html#git-concepts[git concepts chapter of the
 -user-manual] and linkgit:gitcore-tutorial[7] both provide
 -introductions to the underlying git architecture.
 -
 -See linkgit:gitworkflows[7] for an overview of recommended workflows.
 -
 -See also the link:howto-index.html[howto] documents for some useful
 -examples.
 -
 -The internals are documented in the
 -link:technical/api-index.html[GIT API documentation].
  
  GIT COMMANDS
  ------------
  
 -We divide git into high level ("porcelain") commands and low level
 +We divide Git into high level ("porcelain") commands and low level
  ("plumbing") commands.
  
  High-level commands (porcelain)
@@@ -488,7 -466,7 +488,7 @@@ include::cmds-foreignscminterface.txt[
  Low-level commands (plumbing)
  -----------------------------
  
 -Although git includes its
 +Although Git includes its
  own porcelain layer, its low-level commands are sufficient to support
  development of alternative porcelains.  Developers of such porcelains
  might start by reading about linkgit:git-update-index[1] and
@@@ -546,9 -524,10 +546,9 @@@ include::cmds-purehelpers.txt[
  Configuration Mechanism
  -----------------------
  
 -Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file
 -is used to hold per-repository configuration options.  It is a
 -simple text file modeled after `.ini` format familiar to some
 -people.  Here is an example:
 +Git uses a simple text format to store customizations that are per
 +repository and are per user.  Such a configuration file may look
 +like this:
  
  ------------
  #
@@@ -563,13 -542,13 +563,13 @@@
  ; user identity
  [user]
  	name = "Junio C Hamano"
 -	email = "junkio@twinsun.com"
 +	email = "gitster@pobox.com"
  
  ------------
  
  Various commands read from the configuration file and adjust
  their operation accordingly.  See linkgit:git-config[1] for a
 -list.
 +list and more details about the configuration mechanism.
  
  
  Identifier Terminology
@@@ -608,7 -587,7 +608,7 @@@
  
  Symbolic Identifiers
  --------------------
 -Any git command accepting any <object> can also use the following
 +Any Git command accepting any <object> can also use the following
  symbolic notation:
  
  HEAD::
@@@ -644,13 -623,13 +644,13 @@@ Please see linkgit:gitglossary[7]
  
  Environment Variables
  ---------------------
 -Various git commands use the following environment variables:
 +Various Git commands use the following environment variables:
  
 -The git Repository
 +The Git Repository
  ~~~~~~~~~~~~~~~~~~
 -These environment variables apply to 'all' core git commands. Nb: it
 +These environment variables apply to 'all' core Git commands. Nb: it
  is worth noting that they may be used/overridden by SCMS sitting above
 -git so take care if using Cogito etc.
 +Git so take care if using Cogito etc.
  
  'GIT_INDEX_FILE'::
  	This environment allows the specification of an alternate
@@@ -664,17 -643,16 +664,17 @@@
  	directory is used.
  
  'GIT_ALTERNATE_OBJECT_DIRECTORIES'::
 -	Due to the immutable nature of git objects, old objects can be
 +	Due to the immutable nature of Git objects, old objects can be
  	archived into shared, read-only directories. This variable
  	specifies a ":" separated (on Windows ";" separated) list
 -	of git object directories which can be used to search for git
 +	of Git object directories which can be used to search for Git
  	objects. New objects will not be written to these directories.
  
  'GIT_DIR'::
  	If the 'GIT_DIR' environment variable is set then it
  	specifies a path to use instead of the default `.git`
  	for the base of the repository.
 +	The '--git-dir' command-line option also sets this value.
  
  'GIT_WORK_TREE'::
  	Set the path to the working tree.  The value will not be
@@@ -684,35 -662,28 +684,35 @@@
  	option and the core.worktree configuration variable.
  
  'GIT_NAMESPACE'::
 -	Set the git namespace; see linkgit:gitnamespaces[7] for details.
 +	Set the Git namespace; see linkgit:gitnamespaces[7] for details.
  	The '--namespace' command-line option also sets this value.
  
  'GIT_CEILING_DIRECTORIES'::
 -	This should be a colon-separated list of absolute paths.
 -	If set, it is a list of directories that git should not chdir
 -	up into while looking for a repository directory.
 -	It will not exclude the current working directory or
 -	a GIT_DIR set on the command line or in the environment.
 -	(Useful for excluding slow-loading network directories.)
 +	This should be a colon-separated list of absolute paths.  If
 +	set, it is a list of directories that Git should not chdir up
 +	into while looking for a repository directory (useful for
 +	excluding slow-loading network directories).  It will not
 +	exclude the current working directory or a GIT_DIR set on the
 +	command line or in the environment.  Normally, Git has to read
 +	the entries in this list and resolve any symlink that
 +	might be present in order to compare them with the current
 +	directory.  However, if even this access is slow, you
 +	can add an empty entry to the list to tell Git that the
 +	subsequent entries are not symlinks and needn't be resolved;
 +	e.g.,
 +	'GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink'.
  
  'GIT_DISCOVERY_ACROSS_FILESYSTEM'::
  	When run in a directory that does not have ".git" repository
 -	directory, git tries to find such a directory in the parent
 +	directory, Git tries to find such a directory in the parent
  	directories to find the top of the working tree, but by default it
  	does not cross filesystem boundaries.  This environment variable
 -	can be set to true to tell git not to stop at filesystem
 +	can be set to true to tell Git not to stop at filesystem
  	boundaries.  Like 'GIT_CEILING_DIRECTORIES', this will not affect
  	an explicit repository directory set via 'GIT_DIR' or on the
  	command line.
  
 -git Commits
 +Git Commits
  ~~~~~~~~~~~
  'GIT_AUTHOR_NAME'::
  'GIT_AUTHOR_EMAIL'::
@@@ -723,13 -694,13 +723,13 @@@
  'EMAIL'::
  	see linkgit:git-commit-tree[1]
  
 -git Diffs
 +Git Diffs
  ~~~~~~~~~
  'GIT_DIFF_OPTS'::
  	Only valid setting is "--unified=??" or "-u??" to set the
  	number of context lines shown when a unified diff is created.
  	This takes precedence over any "-U" or "--unified" option
 -	value passed on the git diff command line.
 +	value passed on the Git diff command line.
  
  'GIT_EXTERNAL_DIFF'::
  	When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
@@@ -743,7 -714,7 +743,7 @@@ where
  
  	<old|new>-file:: are files GIT_EXTERNAL_DIFF can use to read the
                           contents of <old|new>,
 -	<old|new>-hex:: are the 40-hexdigit SHA1 hashes,
 +	<old|new>-hex:: are the 40-hexdigit SHA-1 hashes,
  	<old|new>-mode:: are the octal representation of the file modes.
  +
  The file parameters can point at the user's working file
@@@ -764,13 -735,13 +764,13 @@@ othe
  
  'GIT_PAGER'::
  	This environment variable overrides `$PAGER`. If it is set
 -	to an empty string or to the value "cat", git will not launch
 +	to an empty string or to the value "cat", Git will not launch
  	a pager.  See also the `core.pager` option in
  	linkgit:git-config[1].
  
  'GIT_EDITOR'::
  	This environment variable overrides `$EDITOR` and `$VISUAL`.
 -	It is used by several git commands when, on interactive mode,
 +	It is used by several Git commands when, on interactive mode,
  	an editor is to be launched. See also linkgit:git-var[1]
  	and the `core.editor` option in linkgit:git-config[1].
  
@@@ -778,12 -749,9 +778,12 @@@
  	If this environment variable is set then 'git fetch'
  	and 'git push' will use this command instead
  	of 'ssh' when they need to connect to a remote system.
 -	The '$GIT_SSH' command will be given exactly two arguments:
 -	the 'username@host' (or just 'host') from the URL and the
 -	shell command to execute on that remote system.
 +	The '$GIT_SSH' command will be given exactly two or
 +	four arguments: the 'username@host' (or just 'host')
 +	from the URL and the shell command to execute on that
 +	remote system, optionally preceded by '-p' (literally) and
 +	the 'port' from the URL when it specifies something other
 +	than the default SSH port.
  +
  To pass options to the program that you want to list in GIT_SSH
  you will need to wrap the program and options into a shell script,
@@@ -794,62 -762,45 +794,63 @@@ personal `.ssh/config` file.  Please co
  for further details.
  
  'GIT_ASKPASS'::
 -	If this environment variable is set, then git commands which need to
 +	If this environment variable is set, then Git commands which need to
  	acquire passwords or passphrases (e.g. for HTTP or IMAP authentication)
  	will call this program with a suitable prompt as command line argument
  	and read the password from its STDOUT. See also the 'core.askpass'
  	option in linkgit:git-config[1].
  
 +'GIT_CONFIG_NOSYSTEM'::
 +	Whether to skip reading settings from the system-wide
 +	`$(prefix)/etc/gitconfig` file.  This environment variable can
 +	be used along with `$HOME` and `$XDG_CONFIG_HOME` to create a
 +	predictable environment for a picky script, or you can set it
 +	temporarily to avoid using a buggy `/etc/gitconfig` file while
 +	waiting for someone with sufficient permissions to fix it.
 +
  'GIT_FLUSH'::
  	If this environment variable is set to "1", then commands such
  	as 'git blame' (in incremental mode), 'git rev-list', 'git log',
- 	and 'git whatchanged' will force a flush of the output stream
- 	after each commit-oriented record have been flushed.   If this
+ 	'git check-attr', 'git check-ignore', and 'git whatchanged' will
+ 	force a flush of the output stream after each record have been
+ 	flushed. If this
  	variable is set to "0", the output of these commands will be done
  	using completely buffered I/O.   If this environment variable is
 -	not set, git will choose buffered or record-oriented flushing
 +	not set, Git will choose buffered or record-oriented flushing
  	based on whether stdout appears to be redirected to a file or not.
  
  'GIT_TRACE'::
  	If this variable is set to "1", "2" or "true" (comparison
 -	is case insensitive), git will print `trace:` messages on
 +	is case insensitive), Git will print `trace:` messages on
  	stderr telling about alias expansion, built-in command
  	execution and external command execution.
  	If this variable is set to an integer value greater than 1
 -	and lower than 10 (strictly) then git will interpret this
 +	and lower than 10 (strictly) then Git will interpret this
  	value as an open file descriptor and will try to write the
  	trace messages into this file descriptor.
  	Alternatively, if this variable is set to an absolute path
 -	(starting with a '/' character), git will interpret this
 +	(starting with a '/' character), Git will interpret this
  	as a file path and will try to write the trace messages
  	into it.
  
 +GIT_LITERAL_PATHSPECS::
 +	Setting this variable to `1` will cause Git to treat all
 +	pathspecs literally, rather than as glob patterns. For example,
 +	running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search
 +	for commits that touch the path `*.c`, not any paths that the
 +	glob `*.c` matches. You might want this if you are feeding
 +	literal paths to Git (e.g., paths previously given to you by
 +	`git ls-tree`, `--raw` diff output, etc).
 +
 +
  Discussion[[Discussion]]
  ------------------------
  
  More detail on the following is available from the
 -link:user-manual.html#git-concepts[git concepts chapter of the
 +link:user-manual.html#git-concepts[Git concepts chapter of the
  user-manual] and linkgit:gitcore-tutorial[7].
  
 -A git project normally consists of a working directory with a ".git"
 +A Git project normally consists of a working directory with a ".git"
  subdirectory at the top level.  The .git directory contains, among other
  things, a compressed object database representing the complete history
  of the project, an "index" file which links that history to the current
@@@ -866,7 -817,7 +867,7 @@@ The commit, equivalent to what other sy
  represents an immediately preceding step.  Commits with more than one
  parent represent merges of independent lines of development.
  
 -All objects are named by the SHA1 hash of their contents, normally
 +All objects are named by the SHA-1 hash of their contents, normally
  written as a string of 40 hex digits.  Such names are globally unique.
  The entire history leading up to a commit can be vouched for by signing
  just that commit.  A fourth object type, the tag, is provided for this
@@@ -876,9 -827,9 +877,9 @@@ When first created, objects are stored 
  efficiency may later be compressed together into "pack files".
  
  Named pointers called refs mark interesting points in history.  A ref
 -may contain the SHA1 name of an object or the name of another ref.  Refs
 -with names beginning `ref/head/` contain the SHA1 name of the most
 -recent commit (or "head") of a branch under development.  SHA1 names of
 +may contain the SHA-1 name of an object or the name of another ref.  Refs
 +with names beginning `ref/head/` contain the SHA-1 name of the most
 +recent commit (or "head") of a branch under development.  SHA-1 names of
  tags of interest are stored under `ref/tags/`.  A special ref named
  `HEAD` contains the name of the currently checked-out branch.
  
@@@ -895,37 -846,12 +896,37 @@@ The index is also capable of storing mu
  for a given pathname.  These stages are used to hold the various
  unmerged version of a file when a merge is in progress.
  
 +FURTHER DOCUMENTATION
 +---------------------
 +
 +See the references in the "description" section to get started
 +using Git.  The following is probably more detail than necessary
 +for a first-time user.
 +
 +The link:user-manual.html#git-concepts[Git concepts chapter of the
 +user-manual] and linkgit:gitcore-tutorial[7] both provide
 +introductions to the underlying Git architecture.
 +
 +See linkgit:gitworkflows[7] for an overview of recommended workflows.
 +
 +See also the link:howto-index.html[howto] documents for some useful
 +examples.
 +
 +The internals are documented in the
 +link:technical/api-index.html[Git API documentation].
 +
 +Users migrating from CVS may also want to
 +read linkgit:gitcvs-migration[7].
 +
 +
  Authors
  -------
  Git was started by Linus Torvalds, and is currently maintained by Junio
 -C Hamano. Numerous contributions have come from the git mailing list
 -<git@vger.kernel.org>. For a more complete list of contributors, see
 -http://git-scm.com/about. If you have a clone of git.git itself, the
 +C Hamano. Numerous contributions have come from the Git mailing list
 +<git@vger.kernel.org>.  http://www.ohloh.net/p/git/contributors/summary
 +gives you a more complete list of contributors.
 +
 +If you have a clone of git.git itself, the
  output of linkgit:git-shortlog[1] and linkgit:git-blame[1] can show you
  the authors for specific parts of the project.
  
diff --combined builtin/check-ignore.c
index 854a88a056,c00a7d6bb9..4a8fc707c7
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@@ -5,7 -5,7 +5,7 @@@
  #include "pathspec.h"
  #include "parse-options.h"
  
- static int quiet, verbose, stdin_paths;
+ static int quiet, verbose, stdin_paths, show_non_matching;
  static const char * const check_ignore_usage[] = {
  "git check-ignore [options] pathname...",
  "git check-ignore [options] --stdin < <list-of-paths>",
@@@ -22,21 -22,28 +22,28 @@@ static const struct option check_ignore
  		    N_("read file names from stdin")),
  	OPT_BOOLEAN('z', NULL, &null_term_line,
  		    N_("input paths are terminated by a null character")),
+ 	OPT_BOOLEAN('n', "non-matching", &show_non_matching,
+ 		    N_("show non-matching input paths")),
  	OPT_END()
  };
  
  static void output_exclude(const char *path, struct exclude *exclude)
  {
- 	char *bang  = exclude->flags & EXC_FLAG_NEGATIVE  ? "!" : "";
- 	char *slash = exclude->flags & EXC_FLAG_MUSTBEDIR ? "/" : "";
+ 	char *bang  = (exclude && exclude->flags & EXC_FLAG_NEGATIVE)  ? "!" : "";
+ 	char *slash = (exclude && exclude->flags & EXC_FLAG_MUSTBEDIR) ? "/" : "";
  	if (!null_term_line) {
  		if (!verbose) {
  			write_name_quoted(path, stdout, '\n');
  		} else {
- 			quote_c_style(exclude->el->src, NULL, stdout, 0);
- 			printf(":%d:%s%s%s\t",
- 			       exclude->srcpos,
- 			       bang, exclude->pattern, slash);
+ 			if (exclude) {
+ 				quote_c_style(exclude->el->src, NULL, stdout, 0);
+ 				printf(":%d:%s%s%s\t",
+ 				       exclude->srcpos,
+ 				       bang, exclude->pattern, slash);
+ 			}
+ 			else {
+ 				printf("::\t");
+ 			}
  			quote_c_style(path, NULL, stdout, 0);
  			fputc('\n', stdout);
  		}
@@@ -44,30 -51,26 +51,26 @@@
  		if (!verbose) {
  			printf("%s%c", path, '\0');
  		} else {
- 			printf("%s%c%d%c%s%s%s%c%s%c",
- 			       exclude->el->src, '\0',
- 			       exclude->srcpos, '\0',
- 			       bang, exclude->pattern, slash, '\0',
- 			       path, '\0');
+ 			if (exclude)
+ 				printf("%s%c%d%c%s%s%s%c%s%c",
+ 				       exclude->el->src, '\0',
+ 				       exclude->srcpos, '\0',
+ 				       bang, exclude->pattern, slash, '\0',
+ 				       path, '\0');
+ 			else
+ 				printf("%c%c%c%s%c", '\0', '\0', '\0', path, '\0');
  		}
  	}
  }
  
- static int check_ignore(const char *prefix, const char **pathspec)
 -static int check_ignore(struct path_exclude_check *check,
++static int check_ignore(struct dir_struct *dir,
+ 			const char *prefix, const char **pathspec)
  {
- 	struct dir_struct dir;
  	const char *path, *full_path;
  	char *seen;
  	int num_ignored = 0, dtype = DT_UNKNOWN, i;
  	struct exclude *exclude;
  
- 	/* read_cache() is only necessary so we can watch out for submodules. */
- 	if (read_cache() < 0)
- 		die(_("index file corrupt"));
- 
- 	memset(&dir, 0, sizeof(dir));
- 	setup_standard_excludes(&dir);
- 
  	if (!pathspec || !*pathspec) {
  		if (!quiet)
  			fprintf(stderr, "no pathspec given.\n");
@@@ -86,28 -89,27 +89,26 @@@
  					? strlen(prefix) : 0, path);
  		full_path = check_path_for_gitlink(full_path);
  		die_if_path_beyond_symlink(full_path, prefix);
+ 		exclude = NULL;
  		if (!seen[i]) {
- 			exclude = last_exclude_matching(&dir, full_path, &dtype);
- 			if (exclude) {
- 				if (!quiet)
- 					output_exclude(path, exclude);
- 				num_ignored++;
- 			}
 -			exclude = last_exclude_matching_path(check, full_path,
 -							     -1, &dtype);
++			exclude = last_exclude_matching(dir, full_path, &dtype);
  		}
+ 		if (!quiet && (exclude || show_non_matching))
+ 			output_exclude(path, exclude);
+ 		if (exclude)
+ 			num_ignored++;
  	}
  	free(seen);
- 	clear_directory(&dir);
  
  	return num_ignored;
  }
  
- static int check_ignore_stdin_paths(const char *prefix)
 -static int check_ignore_stdin_paths(struct path_exclude_check *check, const char *prefix)
++static int check_ignore_stdin_paths(struct dir_struct *dir, const char *prefix)
  {
  	struct strbuf buf, nbuf;
- 	char **pathspec = NULL;
- 	size_t nr = 0, alloc = 0;
+ 	char *pathspec[2] = { NULL, NULL };
  	int line_termination = null_term_line ? 0 : '\n';
- 	int num_ignored;
+ 	int num_ignored = 0;
  
  	strbuf_init(&buf, 0);
  	strbuf_init(&nbuf, 0);
@@@ -118,23 -120,20 +119,19 @@@
  				die("line is badly quoted");
  			strbuf_swap(&buf, &nbuf);
  		}
- 		ALLOC_GROW(pathspec, nr + 1, alloc);
- 		pathspec[nr] = xcalloc(strlen(buf.buf) + 1, sizeof(*buf.buf));
- 		strcpy(pathspec[nr++], buf.buf);
+ 		pathspec[0] = buf.buf;
 -		num_ignored += check_ignore(check, prefix, (const char **)pathspec);
++		num_ignored += check_ignore(dir, prefix, (const char **)pathspec);
+ 		maybe_flush_or_die(stdout, "check-ignore to stdout");
  	}
- 	ALLOC_GROW(pathspec, nr + 1, alloc);
- 	pathspec[nr] = NULL;
- 	num_ignored = check_ignore(prefix, (const char **)pathspec);
- 	maybe_flush_or_die(stdout, "attribute to stdout");
  	strbuf_release(&buf);
  	strbuf_release(&nbuf);
- 	free(pathspec);
  	return num_ignored;
  }
  
  int cmd_check_ignore(int argc, const char **argv, const char *prefix)
  {
  	int num_ignored;
+ 	struct dir_struct dir;
 -	struct path_exclude_check check;
  
  	git_config(git_default_config, NULL);
  
@@@ -156,13 -155,27 +153,24 @@@
  		if (verbose)
  			die(_("cannot have both --quiet and --verbose"));
  	}
+ 	if (show_non_matching && !verbose)
+ 		die(_("--non-matching is only valid with --verbose"));
+ 
+ 	/* read_cache() is only necessary so we can watch out for submodules. */
+ 	if (read_cache() < 0)
+ 		die(_("index file corrupt"));
+ 
+ 	memset(&dir, 0, sizeof(dir));
 -	dir.flags |= DIR_COLLECT_IGNORED;
+ 	setup_standard_excludes(&dir);
  
 -	path_exclude_check_init(&check, &dir);
  	if (stdin_paths) {
- 		num_ignored = check_ignore_stdin_paths(prefix);
 -		num_ignored = check_ignore_stdin_paths(&check, prefix);
++		num_ignored = check_ignore_stdin_paths(&dir, prefix);
  	} else {
- 		num_ignored = check_ignore(prefix, argv);
 -		num_ignored = check_ignore(&check, prefix, argv);
++		num_ignored = check_ignore(&dir, prefix, argv);
  		maybe_flush_or_die(stdout, "ignore to stdout");
  	}
  
+ 	clear_directory(&dir);
 -	path_exclude_check_clear(&check);
+ 
  	return !num_ignored;
  }