summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-11-30 14:49:45 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-11-30 14:49:45 -0800
commit3d8f81f21bdce9e0472ae8921fab31e650030ecd (patch)
tree26c94bfd52a7d675970fb85213f8692eda69fa61 /Documentation
parentMerge branch 'km/stash-error-message-fix' (diff)
parentcrendential-store: use timeout when locking file (diff)
downloadtgif-3d8f81f21bdce9e0472ae8921fab31e650030ecd.tar.xz
Merge branch 'sa/credential-store-timeout'
Multiple "credential-store" backends can race to lock the same file, causing everybody else but one to fail---reattempt locking with some timeout to reduce the rate of the failure. * sa/credential-store-timeout: crendential-store: use timeout when locking file
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config/credential.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config/credential.txt b/Documentation/config/credential.txt
index 9d01641c28..512f31876e 100644
--- a/Documentation/config/credential.txt
+++ b/Documentation/config/credential.txt
@@ -28,3 +28,9 @@ credential.<url>.*::
credentialCache.ignoreSIGHUP::
Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting.
+
+credentialStore.lockTimeoutMS::
+ The length of time, in milliseconds, for git-credential-store to retry
+ when trying to lock the credentials file. Value 0 means not to retry at
+ all; -1 means to try indefinitely. Default is 1000 (i.e., retry for
+ 1s).