X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=entry.c;h=9d5b232781c6760930c354c1792ad6b924f8a72d;hb=6a5cedac87ff4f1d8d8b535dac8184e1f7fbc454;hp=06d24f14c6ba9401637aebfb11659ae747796c06;hpb=31f0bce8537a38639385366f05ba43e91bd91e38;p=git.git

diff --git a/entry.c b/entry.c
index 06d24f14c..9d5b23278 100644
--- 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) {