]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 83b2df8 ab16b9a)
Merge branch 'jt/config-lock-timeout' into jch
authorJunio C Hamano <gitster@pobox.com>
Thu, 9 Apr 2026 18:22:17 +0000 (11:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Apr 2026 18:22:18 +0000 (11:22 -0700)
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

1  2 
config.c patch | diff1 | diff2 | blob | history

diff --cc config.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.