From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jun 2026 23:14:07 +0000 (+0900)
Subject: Merge branch 'jt/config-lock-timeout' into seen
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=a65c886b2482206c79b5f6d71078dc57f830b1e8;p=thirdparty%2Fgit.git

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

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
---

a65c886b2482206c79b5f6d71078dc57f830b1e8