Skip to content

Commit 43f1180

Browse files
benpeartgitster
authored andcommitted
git-mv: allow submodules and fsmonitor to work together
It was reported that GIT_FSMONITOR_TEST=$PWD/t7519/fsmonitor-all ./t7411-submodule-config.sh breaks as the fsmonitor data is out of sync with the state of the .gitmodules file. Update is_staging_gitmodules_ok() so that it no longer tells ie_match_stat() to ignore refreshing the fsmonitor data. Reported-by: Ævar Arnfjörð Bjarmason <[email protected]> Helped-by: Stefan Beller <[email protected]> Signed-off-by: Ben Peart <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 53f9a3e commit 43f1180

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
@@ -65,8 +65,7 @@ int is_staging_gitmodules_ok(struct index_state *istate)
6565
if ((pos >= 0) && (pos < istate->cache_nr)) {
6666
struct stat st;
6767
if (lstat(GITMODULES_FILE, &st) == 0 &&
68-
ie_match_stat(istate, istate->cache[pos], &st,
69-
CE_MATCH_IGNORE_FSMONITOR) & DATA_CHANGED)
68+
ie_match_stat(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
7069
return 0;
7170
}
7271

0 commit comments

Comments
 (0)