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

git-mv: allow submodules and fsmonitor to work together

Browse Source 
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 <avarab@gmail.com>
Helped-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Ben Peart <benpeart@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ben Peart 2018-09-10 16:29:29 +00:00 committed by Junio C Hamano
parent 53f9a3e157
commit 43f1180814
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;
} }