summaryrefslogtreecommitdiff
path: root/config.c
diff options
context:
space:
mode:
authorJohannes Sixt <johannes.sixt@telecom.at>2008-02-05 09:17:33 +0100
committerJunio C Hamano <gitster@pobox.com>2008-02-05 01:44:10 -0800
commitef5b9d6e2286630bf8afb5bdf1c6e3356f3d50c7 (patch)
tree98469bc91f8f147db82a9df883d37579a0c3c647 /config.c
parent7a2078b4b00fb1c5d7b0bf8155778f79377b8f2f (diff)
downloadgit-ef5b9d6e2286630bf8afb5bdf1c6e3356f3d50c7.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. Noticed by Junio C Hamano. We concatenate the paths manually. (prefix_filename() won't do because it expects a prefix with a trailing '/'.) Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'config.c')
-rw-r--r--config.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/config.c b/config.c
index 0b0c9bd050..498259ebef 100644
--- a/config.c
+++ b/config.c
@@ -484,10 +484,9 @@ const char *git_etc_gitconfig(void)
system_wide = ETC_GITCONFIG;
if (!is_absolute_path(system_wide)) {
/* interpret path relative to exec-dir */
- const char *exec_path = git_exec_path();
- system_wide = strdup(prefix_filename(exec_path,
- strlen(exec_path),
- system_wide));
+ struct strbuf d = STRBUF_INIT;
+ strbuf_addf(&d, "%s/%s", git_exec_path(), system_wide);
+ system_wide = strbuf_detach(&d, NULL);
}
}
return system_wide;