diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:33:49 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 10:33:50 -0800 |
| commit | cf44c1e0a2f5c8dc1a615659b0234a459b2148c2 (patch) | |
| tree | 0305bb631f5335427f57f01abc8306d1f44ac0ff /dir.h | |
| parent | e3a80781f5932f5fea12a49eb06f3ade4ed8945c (diff) | |
| parent | 0cacebf099dd6467845419f212acdcfe5f8d923f (diff) | |
| download | git-cf44c1e0a2f5c8dc1a615659b0234a459b2148c2.tar.gz | |
Merge branch 'nd/fix-untracked-cache-invalidation'
Some bugs around "untracked cache" feature have been fixed.
* nd/fix-untracked-cache-invalidation:
dir.c: ignore paths containing .git when invalidating untracked cache
dir.c: stop ignoring opendir() error in open_cached_dir()
dir.c: fix missing dir invalidation in untracked code
dir.c: avoid stat() in valid_cached_dir()
status: add a failing test showing a core.untrackedCache bug
Diffstat (limited to 'dir.h')
| -rw-r--r-- | dir.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -350,7 +350,7 @@ static inline int dir_path_match(const struct dir_entry *ent, int cmp_dir_entry(const void *p1, const void *p2); int check_dir_entry_contains(const struct dir_entry *out, const struct dir_entry *in); -void untracked_cache_invalidate_path(struct index_state *, const char *); +void untracked_cache_invalidate_path(struct index_state *, const char *, int safe_path); void untracked_cache_remove_from_index(struct index_state *, const char *); void untracked_cache_add_to_index(struct index_state *, const char *); |