Merge branch 'bp/mv-submodules-with-fsmonitor' into maint
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
This commit is contained in:
commit
07c5a1bce3
@ -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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user