summaryrefslogtreecommitdiff
path: root/Documentation/config
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-02-14 12:54:20 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-02-14 12:54:20 -0800
commitc9a33e5e5d7e124feb86ccff08ea466faff53b26 (patch)
tree8a451a494fd002caf274e8341f6e4fa83a74473c /Documentation/config
parentMerge branch 'mt/threaded-grep-in-object-store' (diff)
parentfsmonitor: update documentation for hook version and watchman hooks (diff)
downloadtgif-c9a33e5e5d7e124feb86ccff08ea466faff53b26.tar.xz
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 'Documentation/config')
-rw-r--r--Documentation/config/core.txt11
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt
index 9e440b160d..74619a9c03 100644
--- a/Documentation/config/core.txt
+++ b/Documentation/config/core.txt
@@ -68,6 +68,17 @@ core.fsmonitor::
avoiding unnecessary processing of files that have not changed.
See the "fsmonitor-watchman" section of linkgit:githooks[5].
+core.fsmonitorHookVersion::
+ Sets the version of hook that is to be used when calling fsmonitor.
+ There are currently versions 1 and 2. When this is not set,
+ version 2 will be tried first and if it fails then version 1
+ will be tried. Version 1 uses a timestamp as input to determine
+ which files have changes since that time but some monitors
+ like watchman have race conditions when used with a timestamp.
+ Version 2 uses an opaque string so that the monitor can return
+ something that can be used to determine what files have changed
+ without race conditions.
+
core.trustctime::
If false, the ctime differences between the index and the
working tree are ignored; useful when the inode change time