Merge branch 'jk/reopen-tempfile-truncate' into maint

diff --git a/submodule.c b/submodule.c
index a2b266fbfae2cd89b00a11008fbcd28bf09777e2..4a5212bdfb4ab9ce5aac4a4c4460fbc9c9ecff38 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -65,8 +65,7 @@ int is_staging_gitmodules_ok(struct index_state *istate)
        if ((pos >= 0) && (pos < istate->cache_nr)) {
                struct stat st;
                if (lstat(GITMODULES_FILE, &st) == 0 &&
-                   ie_match_stat(istate, istate->cache[pos], &st,
-                                 CE_MATCH_IGNORE_FSMONITOR) & DATA_CHANGED)
+                   ie_match_stat(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
                        return 0;
        }