aboutsummaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2015-03-08 17:12:26 +0700
committerJunio C Hamano <gitster@pobox.com>2015-03-12 13:45:15 -0700
commitccad261f07900b55029f3fd42a9ec8f17229808f (patch)
tree83aa6a209172c02c9076202fda95d772081df207 /dir.h
parent0dcb8d7fe0ec2687d4a6ae201ae72907d862437c (diff)
downloadgit-ccad261f07900b55029f3fd42a9ec8f17229808f.tar.gz
git-ccad261f07900b55029f3fd42a9ec8f17229808f.tar.xz
untracked cache: initial untracked cache validation
Make sure the starting conditions and all global exclude files are good to go. If not, either disable untracked cache completely, or wipe out the cache and start fresh. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/dir.h b/dir.h
index 9ab74b4c1..1d7a9585f 100644
--- a/dir.h
+++ b/dir.h
@@ -115,6 +115,8 @@ struct untracked_cache_dir {
unsigned int untracked_alloc, dirs_nr, dirs_alloc;
unsigned int untracked_nr;
unsigned int check_only : 1;
+ /* all data in this struct are good */
+ unsigned int valid : 1;
/* null SHA-1 means this directory does not have .gitignore */
unsigned char exclude_sha1[20];
char name[FLEX_ARRAY];
@@ -132,6 +134,7 @@ struct untracked_cache {
struct untracked_cache_dir *root;
/* Statistics */
int dir_created;
+ int gitignore_invalidated;
};
struct dir_struct {
@@ -186,6 +189,7 @@ struct dir_struct {
struct untracked_cache *untracked;
struct sha1_stat ss_info_exclude;
struct sha1_stat ss_excludes_file;
+ unsigned unmanaged_exclude_files;
};
/*