undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bp/mv-submodules-with-fsmonitor' into maint

Browse Source 
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:
Junio C Hamano 2018-11-21 22:57:43 +09:00
commit 07c5a1bce3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
submodule.c
View File

@ -65,8 +65,7 @@ int is_staging_gitmodules_ok(struct index_state *istate)
if ((pos >= 0) && (pos < istate->cache_nr)) { if ((pos >= 0) && (pos < istate->cache_nr)) {
struct stat st; struct stat st;
if (lstat(GITMODULES_FILE, &st) == 0 && if (lstat(GITMODULES_FILE, &st) == 0 &&
ie_match_stat(istate, istate->cache[pos], &st, ie_match_stat(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
CE_MATCH_IGNORE_FSMONITOR) & DATA_CHANGED)
return 0; return 0;
} }