aboutsummaryrefslogtreecommitdiffstats
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-02-14 12:54:20 -0800
committerJunio C Hamano <gitster@pobox.com>2020-02-14 12:54:20 -0800
commitc9a33e5e5d7e124feb86ccff08ea466faff53b26 (patch)
tree8a451a494fd002caf274e8341f6e4fa83a74473c /cache.h
parentMerge branch 'mt/threaded-grep-in-object-store' (diff)
parentfsmonitor: update documentation for hook version and watchman hooks (diff)
downloadgit-c9a33e5e5d7e124feb86ccff08ea466faff53b26.tar.gz
git-c9a33e5e5d7e124feb86ccff08ea466faff53b26.zip
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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index cbfaead23a..1a2e1cce3d 100644
--- a/cache.h
+++ b/cache.h
@@ -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;