diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-09-24 17:30:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-24 17:30:46 (GMT) |
| commit | 9715f10e4206c681313d45efa239a594a0027e60 (patch) | |
| tree | df44514bcbb9194b4c5a7091357ecd97dd5b4194 /submodule.c | |
| parent | 12d03908b760b959c250defe3c2e5621a8791eb4 (diff) | |
| parent | 43f1180814f456ba5fb90a55c90766b5799bd1a7 (diff) | |
| download | git-9715f10e4206c681313d45efa239a594a0027e60.zip git-9715f10e4206c681313d45efa239a594a0027e60.tar.gz git-9715f10e4206c681313d45efa239a594a0027e60.tar.bz2 | |
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
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c index ed05339..b53cb6e 100644 --- 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; } |