Merge branch 'py/diff-submodule'

diff --git a/read-cache.c b/read-cache.c
index 3b20a142ea93f67d8a1246ebd27797aad8035e6e..4525f8a5ac4d6c1a7ff9c0085036ae0ac1a238bf 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -198,7 +198,8 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st)
 
 static int is_racy_timestamp(const struct index_state *istate, struct cache_entry *ce)
 {
-       return (istate->timestamp &&
+       return (!S_ISGITLINK(ce->ce_mode) &&
+               istate->timestamp &&
                ((unsigned int)istate->timestamp) <= ce->ce_mtime);
 }