diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-11-30 22:49:45 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-30 22:49:45 (GMT) |
commit | 3d8f81f21bdce9e0472ae8921fab31e650030ecd (patch) | |
tree | 26c94bfd52a7d675970fb85213f8692eda69fa61 /Documentation/config | |
parent | fa27e2d103704340d931c5c6670be39ef6a22368 (diff) | |
parent | df7f915fb6fb28ea5a1e3103251c251e53a80b1b (diff) | |
download | git-3d8f81f21bdce9e0472ae8921fab31e650030ecd.zip git-3d8f81f21bdce9e0472ae8921fab31e650030ecd.tar.gz git-3d8f81f21bdce9e0472ae8921fab31e650030ecd.tar.bz2 |
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/config')
-rw-r--r-- | Documentation/config/credential.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config/credential.txt b/Documentation/config/credential.txt index 9d01641..512f318 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). |