diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-02-27 19:33:49 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 19:33:50 +0100 |
| commit | cf44c1e0a2f5c8dc1a615659b0234a459b2148c2 (patch) | |
| tree | 0305bb631f5335427f57f01abc8306d1f44ac0ff /unpack-trees.c | |
| parent | Fourth batch for 2.17 (diff) | |
| parent | dir.c: ignore paths containing .git when invalidating untracked cache (diff) | |
| download | git-cf44c1e0a2f5c8dc1a615659b0234a459b2148c2.tar.xz git-cf44c1e0a2f5c8dc1a615659b0234a459b2148c2.zip | |
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 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index e6a15bbe44..c9f6e314d5 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1528,7 +1528,7 @@ static void invalidate_ce_path(const struct cache_entry *ce, if (!ce) return; cache_tree_invalidate_path(o->src_index, ce->name); - untracked_cache_invalidate_path(o->src_index, ce->name); + untracked_cache_invalidate_path(o->src_index, ce->name, 1); } /* |