Merge branch 'nd/sparse'

[thirdparty/git.git] / entry.c

diff --git a/entry.c b/entry.c
index 06d24f14c6ba9401637aebfb11659ae747796c06..9d5b232781c6760930c354c1792ad6b924f8a72d 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -206,7 +206,7 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *t
        len += ce_namelen(ce);
 
        if (!check_path(path, len, &st, state->base_dir_len)) {
-               unsigned changed = ce_match_stat(ce, &st, CE_MATCH_IGNORE_VALID);
+               unsigned changed = ce_match_stat(ce, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE);
                if (!changed)
                        return 0;
                if (!state->force) {