diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:20 -0800 |
| commit | c9a33e5e5d7e124feb86ccff08ea466faff53b26 (patch) | |
| tree | 8a451a494fd002caf274e8341f6e4fa83a74473c /cache.h | |
| parent | 56ceb64eb0377acb2884226d4fb7d7c3f4032354 (diff) | |
| parent | dfaed028620c2dca08d24583c7fc8b0aef9b6d0f (diff) | |
| download | git-c9a33e5e5d7e124feb86ccff08ea466faff53b26.tar.gz | |
Merge branch 'kw/fsmonitor-watchman-racefix'
A new version of fsmonitor-watchman hook has been introduced, to
avoid races.
* kw/fsmonitor-watchman-racefix:
fsmonitor: update documentation for hook version and watchman hooks
fsmonitor: add fsmonitor hook scripts for version 2
fsmonitor: handle version 2 of the hooks that will use opaque token
fsmonitor: change last update timestamp on the index_state to opaque token
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -324,7 +324,7 @@ struct index_state { struct hashmap dir_hash; struct object_id oid; struct untracked_cache *untracked; - uint64_t fsmonitor_last_update; + char *fsmonitor_last_update; struct ewah_bitmap *fsmonitor_dirty; struct mem_pool *ce_mem_pool; struct progress *progress; |