summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorPatrick Steinhardt <ps@pks.im>2016-02-22 12:23:36 +0100
committerJunio C Hamano <gitster@pobox.com>2016-02-22 10:23:55 -0800
commit3d1806487af395fb33d1de92633e96571b296305 (patch)
treec7bc07258511d11eaf29fc9be1386a42688dcbe8 /submodule.c
parent30598ad06f2adfef1f74d6348677358865cbf373 (diff)
downloadgit-3d1806487af395fb33d1de92633e96571b296305.tar.gz
config: rename git_config_set_or_die to git_config_setps/config-error
Rename git_config_set_or_die functions to git_config_set, leading to the new default behavior of dying whenever a configuration error occurs. By now all callers that shall die on error have been transitioned to the _or_die variants, thus making this patch a simple rename of the functions. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.c')
-rw-r--r--submodule.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/submodule.c b/submodule.c
index e76311d7ea..b58d4ee945 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1034,9 +1034,9 @@ void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir)
/* Update core.worktree setting */
strbuf_reset(&file_name);
strbuf_addf(&file_name, "%s/config", git_dir);
- git_config_set_in_file_or_die(file_name.buf, "core.worktree",
- relative_path(real_work_tree, git_dir,
- &rel_path));
+ git_config_set_in_file(file_name.buf, "core.worktree",
+ relative_path(real_work_tree, git_dir,
+ &rel_path));
strbuf_release(&file_name);
strbuf_release(&rel_path);