Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'bp/mv-submodules-with-fsmonitor'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 24 Sep 2018 17:30:46 +0000
(10:30 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 24 Sep 2018 17:30:46 +0000
(10:30 -0700)
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
submodule.c
patch
|
blob
|
history
raw
(from parent 1:
12d0390
)
diff --git
a/submodule.c
b/submodule.c
index ed05339b5889a3add4210a7ef7cfabe0322c54ef..b53cb6e9c4714c3582aab35fea5bfb3739658348 100644
(file)
--- 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;
}