tests: rename duplicate t1009

[thirdparty/git.git] / diff.c

diff --git a/diff.c b/diff.c
index cd35e0c2d7e29012e24cc8f5f49d9d351420b56e..3970df4afcbe62261757547bc7cc9570fd114ae9 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1805,7 +1805,7 @@ static int reuse_worktree_file(const char *name, const unsigned char *sha1, int
         * If ce is marked as "assume unchanged", there is no
         * guarantee that work tree matches what we are looking for.
         */
-       if (ce->ce_flags & CE_VALID)
+       if ((ce->ce_flags & CE_VALID) || ce_skip_worktree(ce))
                return 0;
 
        /*