aboutsummaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-09-11 15:03:28 -0700
committerJunio C Hamano <gitster@pobox.com>2013-09-11 15:03:28 -0700
commit4c4d9d9b654db3eecb6e1107e814a737eafce0d6 (patch)
tree986cc418ff474dd998c2ceeb0d3652dc502dfd92 /dir.h
parent135be1ee2b6cc5b006974e38111990f0e22accd5 (diff)
parent680be044d98b3b703bc33d546a987c19b3779aeb (diff)
downloadgit-4c4d9d9b654db3eecb6e1107e814a737eafce0d6.tar.gz
git-4c4d9d9b654db3eecb6e1107e814a737eafce0d6.tar.xz
Merge branch 'jc/ls-files-killed-optim'
"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
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/dir.h b/dir.h
index 343ec7aa3..9b7e4e77d 100644
--- a/dir.h
+++ b/dir.h
@@ -80,7 +80,8 @@ struct dir_struct {
DIR_HIDE_EMPTY_DIRECTORIES = 1<<2,
DIR_NO_GITLINKS = 1<<3,
DIR_COLLECT_IGNORED = 1<<4,
- DIR_SHOW_IGNORED_TOO = 1<<5
+ DIR_SHOW_IGNORED_TOO = 1<<5,
+ DIR_COLLECT_KILLED_ONLY = 1<<6
} flags;
struct dir_entry **entries;
struct dir_entry **ignored;