summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-03 22:37:58 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-03 22:49:01 -0800
commit7a5375395f8104a8679f9482e0c5faf60e7e9e54 (patch)
treedfe41332f58be30ec51745797c8521f8f1dd0c2e /config.c
parentd0b8c9e561ea427104611bf392598a398c18d7cb (diff)
downloadgit-7a5375395f8104a8679f9482e0c5faf60e7e9e54.tar.gz
fix misuse of prefix_path()
When DEFAULT_GIT_TEMPLATE_DIR is specified as a relative path, init-db made it relative to exec_path using prefix_path(), which is wrong. prefix_path() is about a file inside the work tree. There was a similar misuse in config.c that takes relative ETC_GITCONFIG path. A convenience function prefix_filename() can concatenate two paths to form a path that points at somewhere outside the work tree. Use it in these codepaths instead. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.c')
-rw-r--r--config.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/config.c b/config.c
index 526a3f4294..0b0c9bd050 100644
--- a/config.c
+++ b/config.c
@@ -485,8 +485,9 @@ const char *git_etc_gitconfig(void)
if (!is_absolute_path(system_wide)) {
/* interpret path relative to exec-dir */
const char *exec_path = git_exec_path();
- system_wide = prefix_path(exec_path, strlen(exec_path),
- system_wide);
+ system_wide = strdup(prefix_filename(exec_path,
+ strlen(exec_path),
+ system_wide));
}
}
return system_wide;