Skip to content

Commit 9715f10

Browse files
committed
Merge branch 'bp/mv-submodules-with-fsmonitor'
When fsmonitor is in use, after operation on submodules updates .gitmodules, we lost track of the fact that we did so and relied on stale fsmonitor data. * bp/mv-submodules-with-fsmonitor: git-mv: allow submodules and fsmonitor to work together
2 parents 12d0390 + 43f1180 commit 9715f10

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

submodule.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ int is_staging_gitmodules_ok(struct index_state *istate)
6666
if ((pos >= 0) && (pos < istate->cache_nr)) {
6767
struct stat st;
6868
if (lstat(GITMODULES_FILE, &st) == 0 &&
69-
ie_match_stat(istate, istate->cache[pos], &st,
70-
CE_MATCH_IGNORE_FSMONITOR) & DATA_CHANGED)
69+
ie_match_stat(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
7170
return 0;
7271
}
7372

0 commit comments

Comments
 (0)