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

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

Browse Source 
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
This commit is contained in:
Junio C Hamano
2026-04-09 11:22:17 -07:00
parent 83b2df8434 ab16b9ae05
commit aa2cd8e5e4
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
config.c
View File

@@ -2906,6 +2906,14 @@ char *git_config_prepare_comment_string(const char *comment)
return prepared;
}
/*
* How long to retry acquiring config.lock when another process holds it.
* The lock is held only for the duration of rewriting a small file, so
* 100 ms covers any realistic contention while still failing fast if
* a stale lock has been left behind by a crashed process.
*/
#define CONFIG_LOCK_TIMEOUT_MS 100
static void validate_comment_string(const char *comment)
{
size_t leading_blanks;
@@ -2989,7 +2997,8 @@ int repo_config_set_multivar_in_file_gently(struct repository *r,
* The lock serves a purpose in addition to locking: the new
* contents of .git/config will be written into it.
*/
fd = hold_lock_file_for_update(&lock, config_filename, 0);
fd = hold_lock_file_for_update_timeout(&lock, config_filename, 0,
CONFIG_LOCK_TIMEOUT_MS);
if (fd < 0) {
error_errno(_("could not lock config file %s"), config_filename);
ret = CONFIG_NO_LOCK;
@@ -3334,7 +3343,8 @@ static int repo_config_copy_or_rename_section_in_file(
if (!config_filename)
config_filename = filename_buf = repo_git_path(r, "config");
out_fd = hold_lock_file_for_update(&lock, config_filename, 0);
out_fd = hold_lock_file_for_update_timeout(&lock, config_filename, 0,
CONFIG_LOCK_TIMEOUT_MS);
if (out_fd < 0) {
ret = error(_("could not lock config file %s"), config_filename);
goto out;