git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-06-22 06:10:17 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge branch 'jt/config-lock-timeout' into seen

Browse Source 
Configuration file locking now retries for a short period, avoiding
failures when multiple processes attempt to update the configuration
simultaneously.

* jt/config-lock-timeout:
  config: retry acquiring config.lock, configurable via core.configLockTimeout
This commit is contained in:
Junio C Hamano
2026-06-17 05:40:10 -07:00
parent 7c37f28fa9 df67d73ca3
commit 84803ed2ca
5 changed files with 53 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/config/core.adoc
View File

@@ -589,6 +589,14 @@ core.packedRefsTimeout::
all; -1 means to try indefinitely. Default is 1000 (i.e.,
retry for 1 second).
core.configLockTimeout::
The length of time, in milliseconds, to retry when trying to
lock a configuration file for writing. Value 0 means not to
retry at all; -1 means to try indefinitely. Default is 1000
(i.e., retry for 1 second). This is read from the configuration
that is already on disk before the lock is taken, so it can be
set persistently like any other option.
core.pager::
Text viewer for use by Git commands (e.g., 'less'). The value
is meant to be interpreted by the shell. The order of preference