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 /builtin | |
| 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 'builtin')
| -rw-r--r-- | builtin/update-index.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c index 27db092..3f8cc6c 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -280,7 +280,7 @@ static int add_one_path(const struct cache_entry *old, const char *path, int len memcpy(ce->name, path, len); ce->ce_flags = create_ce_flags(0); ce->ce_namelen = len; - fill_stat_cache_info(ce, st); + fill_stat_cache_info(&the_index, ce, st); ce->ce_mode = ce_mode_from_stat(old, st->st_mode); if (index_path(&the_index, &ce->oid, path, st, |