From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Jun 2012 21:42:06 +0000 (-0700)
Subject: Merge branch 'jc/ls-files-i-dir'
X-Git-Tag: v1.7.12-rc0~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1966babf6e8e5c67e2dec05aa00437246ded0497;p=thirdparty%2Fgit.git

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

"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
---

1966babf6e8e5c67e2dec05aa00437246ded0497
diff --cc builtin/add.c
index b79336d712,e5b40d9873..87446cf92a
--- 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)