From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 Apr 2026 18:22:17 +0000 (-0700)
Subject: Merge branch 'jt/config-lock-timeout' into jch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=aa2cd8e5e4c7d88ea5db5222b0f6f464bf03b912;p=thirdparty%2Fgit.git

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

The code path to update the configuration file has been taught to
use a short timeout to retry.

Comments?

* jt/config-lock-timeout:
  config: retry acquiring config.lock for 100ms
---

aa2cd8e5e4c7d88ea5db5222b0f6f464bf03b912