Skip to content

Commit 0596fbc

Browse files
kbleesdscho
authored andcommitted
config.c: create missing parent directories when modifying config files
'git config' (--add / --unset etc.) automatically creates missing config files. However, it fails with a misleading error message "could not lock config file" if the parent directory doesn't exist. Also create missing parent directories. This is particularly important when calling git config -f /non/existing/directory/config ... We *must not* create the leading directories when locking a config file. It is the caller's responsibility to ensure that the directory exists, just like it is the caller's responsibility to call `git init` before running repository operations. Point in case: if we simply create all leading directories, calling `git config user.name me` *outside* of a Git worktree will *create* .git/! This fixes #643 and https://groups.google.com/forum/#!topic/git-for-windows/fVRdnDIKVuw [jes: prevented bogus .git/ directories from being created] Signed-off-by: Karsten Blees <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent f8c8582 commit 0596fbc

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

config.c

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1973,6 +1973,20 @@ int git_config_key_is_valid(const char *key)
19731973
return !git_config_parse_key_1(key, NULL, NULL, 1);
19741974
}
19751975

1976+
static int lock_config_file(const char *config_filename,
1977+
struct lock_file **result)
1978+
{
1979+
int fd;
1980+
1981+
*result = xcalloc(1, sizeof(struct lock_file));
1982+
fd = hold_lock_file_for_update(*result, config_filename, 0);
1983+
if (fd < 0)
1984+
error("could not lock config file %s: %s", config_filename,
1985+
strerror(errno));
1986+
1987+
return fd;
1988+
}
1989+
19761990
/*
19771991
* If value==NULL, unset in (remove from) config,
19781992
* if value_regex!=NULL, disregard key/value pairs where value does not match.
@@ -2024,10 +2038,8 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
20242038
* The lock serves a purpose in addition to locking: the new
20252039
* contents of .git/config will be written into it.
20262040
*/
2027-
lock = xcalloc(1, sizeof(struct lock_file));
2028-
fd = hold_lock_file_for_update(lock, config_filename, 0);
2041+
fd = lock_config_file(config_filename, &lock);
20292042
if (fd < 0) {
2030-
error("could not lock config file %s: %s", config_filename, strerror(errno));
20312043
free(store.key);
20322044
ret = CONFIG_NO_LOCK;
20332045
goto out_free;
@@ -2330,12 +2342,9 @@ int git_config_rename_section_in_file(const char *config_filename,
23302342
if (!config_filename)
23312343
config_filename = filename_buf = git_pathdup("config");
23322344

2333-
lock = xcalloc(1, sizeof(struct lock_file));
2334-
out_fd = hold_lock_file_for_update(lock, config_filename, 0);
2335-
if (out_fd < 0) {
2336-
ret = error("could not lock config file %s", config_filename);
2345+
out_fd = lock_config_file(config_filename, &lock);
2346+
if (out_fd < 0)
23372347
goto out;
2338-
}
23392348

23402349
if (!(config_file = fopen(config_filename, "rb"))) {
23412350
/* no config file means nothing to rename, no error */

0 commit comments

Comments
 (0)