Merge branch 'tz/notes-error-to-stderr'

diff --git a/submodule.c b/submodule.c
index 3ee4a0caa7e2db70ec1ba61a2fe152b989e9a186..bb531e0e59ce7f8fa5cde622101b7ef1b324a603 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -62,7 +62,7 @@ int is_staging_gitmodules_ok(const struct index_state *istate)
        if ((pos >= 0) && (pos < istate->cache_nr)) {
                struct stat st;
                if (lstat(GITMODULES_FILE, &st) == 0 &&
-                   ce_match_stat(istate->cache[pos], &st, 0) & DATA_CHANGED)
+                   ce_match_stat(istate->cache[pos], &st, CE_MATCH_IGNORE_FSMONITOR) & DATA_CHANGED)
                        return 0;
        }