midx: close multi-pack-index on repack

diff --git a/submodule.c b/submodule.c
index 058fc9f8855d7719cbc9bb17d646b63d99772c87..b53cb6e9c4714c3582aab35fea5bfb3739658348 100644 (file)
--- a/submodule.c
+++ b/submodule.c
@@ -66,8 +66,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;
        }
 
@@ -537,7 +536,7 @@ static void show_submodule_header(struct diff_options *o, const char *path,
                        fast_backward = 1;
        }
 
-       if (!oidcmp(one, two)) {
+       if (oideq(one, two)) {
                strbuf_release(&sb);
                return;
        }