diff options
| author | Junio C Hamano <gitster@pobox.com> | 2026-05-18 14:29:05 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-05-18 14:29:05 +0900 |
| commit | 31cee669ba10e2d32800b72eb72ddbafb425504b (patch) | |
| tree | af924533600418184cef4d76ca5c352784c9598c /Documentation/config/core.adoc | |
| parent | e308604a4f90a8b4c2ec4b9647ce89f00c348980 (diff) | |
| parent | df67d73ca3268eec5c924d6fe9d2c050ce23f3b1 (diff) | |
| download | git-seen.tar.gz git-seen.zip | |
Merge branch 'jt/config-lock-timeout' into seenseen
Configuration file locking now retries for a short period, avoiding
failures when multiple processes attempt to update the configuration
simultaneously.
Comments?
cf. <xmqqzf1xbl4i.fsf@gitster.g>
* jt/config-lock-timeout:
config: retry acquiring config.lock, configurable via core.configLockTimeout
Diffstat (limited to 'Documentation/config/core.adoc')
| -rw-r--r-- | Documentation/config/core.adoc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/config/core.adoc b/Documentation/config/core.adoc index a0ebf03e2e..340329edc3 100644 --- a/Documentation/config/core.adoc +++ b/Documentation/config/core.adoc @@ -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 |