Merge branch 'jc/ls-files-killed-optim' into maint
commite03a5010b3fc17a1d559ae0fdbcdad63af8e30c9
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 Oct 2013 20:33:08 +0000 (23 13:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 Oct 2013 20:33:08 +0000 (23 13:33 -0700)
tree54ec5075e4781875b4d10cc91860a0247b0d4d2d
parent74051fa805b2b4aa6a0c2e6d4663dc8969e80967
parent680be044d98b3b703bc33d546a987c19b3779aeb
Merge branch 'jc/ls-files-killed-optim' into maint

"git ls-files -k" needs to crawl only the part of the working tree
that may overlap the paths in the index to find killed files, but
shared code with the logic to find all the untracked files, which
made it unnecessarily inefficient.

* jc/ls-files-killed-optim:
  dir.c::test_one_path(): work around directory_exists_in_index_icase() breakage
  t3010: update to demonstrate "ls-files -k" optimization pitfalls
  ls-files -k: a directory only can be killed if the index has a non-directory
  dir.c: use the cache_* macro to access the current index
builtin/ls-files.c
dir.c
t/t3010-ls-files-killed-modified.sh