summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-02-16 03:04:05 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-17 07:52:41 -0800
commit0a5f57592728e7667d9e60e309f6270db9fdb67b (patch)
tree7d857ff695fae308375d680af8f3356ba299a65c
parentconfig: copy the return value of prefix_filename (diff)
downloadtgif-0a5f57592728e7667d9e60e309f6270db9fdb67b.tar.xz
config: teach git_config_set_multivar_in_file a default path
The git_config_set_multivar_in_file function takes a filename argument to specify the file into which the values should be written. Currently, this value must be non-NULL. Callers which want to write to the default location must use the regular, non-"in_file" version, which will either write to config_exclusive_filename, or to the repo config if the exclusive filename is NULL. Let's migrate the "default to using repo config" logic into the "in_file" form. That will let callers get the same default-if-NULL behavior as one gets with config_exclusive_filename, but without having to use the global variable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--config.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/config.c b/config.c
index 40f9c6d103..351ae0b62e 100644
--- a/config.c
+++ b/config.c
@@ -1233,6 +1233,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
int fd = -1, in_fd;
int ret;
struct lock_file *lock = NULL;
+ char *filename_buf = NULL;
/* parse-key returns negative; flip the sign to feed exit(3) */
ret = 0 - git_config_parse_key(key, &store.key, &store.baselen);
@@ -1241,6 +1242,8 @@ int git_config_set_multivar_in_file(const char *config_filename,
store.multi_replace = multi_replace;
+ if (!config_filename)
+ config_filename = filename_buf = git_pathdup("config");
/*
* The lock serves a purpose in addition to locking: the new
@@ -1410,6 +1413,7 @@ int git_config_set_multivar_in_file(const char *config_filename,
out_free:
if (lock)
rollback_lock_file(lock);
+ free(filename_buf);
return ret;
write_err_out:
@@ -1421,19 +1425,9 @@ write_err_out:
int git_config_set_multivar(const char *key, const char *value,
const char *value_regex, int multi_replace)
{
- const char *config_filename;
- char *buf = NULL;
- int ret;
-
- if (config_exclusive_filename)
- config_filename = config_exclusive_filename;
- else
- config_filename = buf = git_pathdup("config");
-
- ret = git_config_set_multivar_in_file(config_filename, key, value,
- value_regex, multi_replace);
- free(buf);
- return ret;
+ return git_config_set_multivar_in_file(config_exclusive_filename,
+ key, value, value_regex,
+ multi_replace);
}
static int section_name_match (const char *buf, const char *name)