Commit ef5b9d6e authored by Johannes Sixt's avatar Johannes Sixt Committed by Junio C Hamano

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: default avatarJohannes Sixt <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 7a2078b4
......@@ -141,8 +141,9 @@ static void copy_templates(const char *git_dir, int len, const char *template_di
*/
template_dir = DEFAULT_GIT_TEMPLATE_DIR;
if (!is_absolute_path(template_dir)) {
const char *exec_path = git_exec_path();
template_dir = prefix_filename(exec_path, strlen(exec_path), template_dir);
struct strbuf d = STRBUF_INIT;
strbuf_addf(&d, "%s/%s", git_exec_path(), template_dir);
template_dir = strbuf_detach(&d, NULL);
}
}
strcpy(template_path, template_dir);
......
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment