diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:43 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 22:57:43 +0900 |
| commit | 07c5a1bce304a7f6ff11edae9c819798a85caeec (patch) | |
| tree | 1af769731b6ab3f6c675126b61aa55281772b65b | |
| parent | ff92463b3cdd99c59ec6fe26271617863d4d4b0c (diff) | |
| parent | 43f1180814f456ba5fb90a55c90766b5799bd1a7 (diff) | |
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
| -rw-r--r-- | submodule.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/submodule.c b/submodule.c index a2b266fbfa..4a5212bdfb 100644 --- a/submodule.c +++ b/submodule.c @@ -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; } |