Skip to content

Commit d497c34

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 427366d commit d497c34

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
@@ -1980,6 +1980,20 @@ int git_config_key_is_valid(const char *key)
19801980
return !git_config_parse_key_1(key, NULL, NULL, 1);
19811981
}
19821982

1983+
static int lock_config_file(const char *config_filename,
1984+
struct lock_file **result)
1985+
{
1986+
int fd;
1987+
1988+
*result = xcalloc(1, sizeof(struct lock_file));
1989+
fd = hold_lock_file_for_update(*result, config_filename, 0);
1990+
if (fd < 0)
1991+
error("could not lock config file %s: %s", config_filename,
1992+
strerror(errno));
1993+
1994+
return fd;
1995+
}
1996+
19831997
/*
19841998
* If value==NULL, unset in (remove from) config,
19851999
* if value_regex!=NULL, disregard key/value pairs where value does not match.
@@ -2031,10 +2045,8 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
20312045
* The lock serves a purpose in addition to locking: the new
20322046
* contents of .git/config will be written into it.
20332047
*/
2034-
lock = xcalloc(1, sizeof(struct lock_file));
2035-
fd = hold_lock_file_for_update(lock, config_filename, 0);
2048+
fd = lock_config_file(config_filename, &lock);
20362049
if (fd < 0) {
2037-
error("could not lock config file %s: %s", config_filename, strerror(errno));
20382050
free(store.key);
20392051
ret = CONFIG_NO_LOCK;
20402052
goto out_free;
@@ -2333,12 +2345,9 @@ int git_config_rename_section_in_file(const char *config_filename,
23332345
if (!config_filename)
23342346
config_filename = filename_buf = git_pathdup("config");
23352347

2336-
lock = xcalloc(1, sizeof(struct lock_file));
2337-
out_fd = hold_lock_file_for_update(lock, config_filename, 0);
2338-
if (out_fd < 0) {
2339-
ret = error("could not lock config file %s", config_filename);
2348+
out_fd = lock_config_file(config_filename, &lock);
2349+
if (out_fd < 0)
23402350
goto out;
2341-
}
23422351

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

0 commit comments

Comments
 (0)