ie_match_stat(): do not ignore skip-worktree bit with CE_MATCH_IGNORE_VALID

diff --git a/entry.c b/entry.c
index f276cf3b88ea40cb4e6d03c623ce27cb0204c63e..efee21fe199768ac1e69578e2c3f4d210f484aa4 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -202,7 +202,7 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *t
        len += ce_namelen(ce);
 
        if (!check_path(path, len, &st)) {
-               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) {