From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Jul 2012 19:44:34 +0000 (-0700)
Subject: Merge branch 'jc/ls-files-i-dir' into maint
X-Git-Tag: v1.7.11.2~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd733f4f713d46bc175fd57fc9a168ea4f846148;p=git.git

Merge branch 'jc/ls-files-i-dir' into maint

"git ls-files --exclude=t -i" did not consider anything under t/ as
excluded, as it did not pay attention to exclusion of leading paths
while walking the index.  Other two users of excluded() are also
updated.

* jc/ls-files-i-dir:
  dir.c: make excluded() file scope static
  unpack-trees.c: use path_excluded() in check_ok_to_remove()
  builtin/add.c: use path_excluded()
  path_excluded(): update API to less cache-entry centric
  ls-files -i: micro-optimize path_excluded()
  ls-files -i: pay attention to exclusion of leading paths
---

cd733f4f713d46bc175fd57fc9a168ea4f846148
diff --cc builtin/add.c
index b79336d71,e5b40d987..87446cf92
--- a/builtin/add.c
+++ b/builtin/add.c
@@@ -458,10 -459,9 +461,11 @@@ int cmd_add(int argc, const char **argv
  			}
  		}
  		free(seen);
+ 		path_exclude_check_clear(&check);
  	}
  
 +	plug_bulk_checkin();
 +
  	exit_status |= add_files_to_cache(prefix, pathspec, flags);
  
  	if (add_new_files)