diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-27 05:55:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-27 05:55:09 (GMT) |
| commit | f2dd90fc1c38ce1d1ebf626e39ddafad130875ae (patch) | |
| tree | efa2f719a8aa9c64c394d4ef78a02b40300cb25c /Documentation | |
| parent | 138e52ea6856c9982d61285d9ff3cb5a65f67d85 (diff) | |
| parent | 4ff0f01cb7dd92fad49b4d0799590bb33a88168a (diff) | |
| download | git-f2dd90fc1c38ce1d1ebf626e39ddafad130875ae.zip git-f2dd90fc1c38ce1d1ebf626e39ddafad130875ae.tar.gz git-f2dd90fc1c38ce1d1ebf626e39ddafad130875ae.tar.bz2 | |
Merge branch 'mh/ref-lock-entry'
The code to acquire a lock on a reference (e.g. while accepting a
push from a client) used to immediately fail when the reference is
already locked---now it waits for a very short while and retries,
which can make it succeed if the lock holder was holding it during
a read-only operation.
* mh/ref-lock-entry:
refs: retry acquiring reference locks for 100ms
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 9b42e0c..dc4e3f5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -776,6 +776,12 @@ core.commentChar:: If set to "auto", `git-commit` would select a character that is not the beginning character of any line in existing commit messages. +core.filesRefLockTimeout:: + The length of time, in milliseconds, to retry when trying to + lock an individual reference. Value 0 means not to retry at + all; -1 means to try indefinitely. Default is 100 (i.e., + retry for 100ms). + core.packedRefsTimeout:: The length of time, in milliseconds, to retry when trying to lock the `packed-refs` file. Value 0 means not to retry at |