diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-17 17:15:17 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-17 17:15:18 (GMT) |
| commit | a3e6b426b95e5a31a884101b7bea4e5d075aea06 (patch) | |
| tree | a4ae23d11e7bd12edac2a70c05131a4a6b6549a7 /read-cache.c | |
| parent | bdc81d15a238c4402cc493817086a0c50dc9a508 (diff) | |
| parent | b5a81697520621a0a1093f590d60d8e578348843 (diff) | |
| download | git-a3e6b426b95e5a31a884101b7bea4e5d075aea06.zip git-a3e6b426b95e5a31a884101b7bea4e5d075aea06.tar.gz git-a3e6b426b95e5a31a884101b7bea4e5d075aea06.tar.bz2 | |
Merge branch 'js/fsmonitor-unflake'
The data collected by fsmonitor was not properly written back to
the on-disk index file, breaking t7519 tests occasionally, which
has been corrected.
* js/fsmonitor-unflake:
mark_fsmonitor_valid(): mark the index as changed if needed
fill_stat_cache_info(): prepare for an fsmonitor fix
Diffstat (limited to 'read-cache.c')
| -rw-r--r-- | read-cache.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/read-cache.c b/read-cache.c index 3477d08..4dd22f4 100644 --- a/read-cache.c +++ b/read-cache.c @@ -195,7 +195,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st) * cache, ie the parts that aren't tracked by GIT, and only used * to validate the cache. */ -void fill_stat_cache_info(struct cache_entry *ce, struct stat *st) +void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st) { fill_stat_data(&ce->ce_stat_data, st); @@ -204,7 +204,7 @@ void fill_stat_cache_info(struct cache_entry *ce, struct stat *st) if (S_ISREG(st->st_mode)) { ce_mark_uptodate(ce); - mark_fsmonitor_valid(ce); + mark_fsmonitor_valid(istate, ce); } } @@ -728,7 +728,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st, memcpy(ce->name, path, namelen); ce->ce_namelen = namelen; if (!intent_only) - fill_stat_cache_info(ce, st); + fill_stat_cache_info(istate, ce, st); else ce->ce_flags |= CE_INTENT_TO_ADD; @@ -1432,7 +1432,7 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate, */ if (!S_ISGITLINK(ce->ce_mode)) { ce_mark_uptodate(ce); - mark_fsmonitor_valid(ce); + mark_fsmonitor_valid(istate, ce); } return ce; } @@ -1447,7 +1447,7 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate, updated = make_empty_cache_entry(istate, ce_namelen(ce)); copy_cache_entry(updated, ce); memcpy(updated->name, ce->name, ce->ce_namelen + 1); - fill_stat_cache_info(updated, &st); + fill_stat_cache_info(istate, updated, &st); /* * If ignore_valid is not set, we should leave CE_VALID bit * alone. Otherwise, paths marked with --no-assume-unchanged |