diff --git a/read-cache.c b/read-cache.c
index ac9a8e7e323bb7b0728b2b199ab4f4a9bc5ce22f..8e5fbb619295fe3e4d950e8926d8034d6f825e41 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
if (ce_uptodate(ce))
return ce;
+ /*
+ * CE_VALID means the user promised us that the change to
+ * the work tree does not matter and told us not to worry.
+ */
+ if (!ignore_valid && (ce->ce_flags & CE_VALID)) {
+ ce_mark_uptodate(ce);
+ return ce;
+ }
+
if (lstat(ce->name, &st) < 0) {
if (err)
*err = errno;