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>

Johannes Sixt committed Feb 5, 2008 at 09:17 UTC ef5b9d6e2286630bf8afb5bdf1c6e3356f3d50c7

2 files changed +6 -6

builtin-init-db.c

+3 -2

@@ -141,8 +141,9 @@ static void copy_templates(const char *git_dir, int len, const char *template_di

141 */

142 template_dir = DEFAULT_GIT_TEMPLATE_DIR;

143 if (!is_absolute_path(template_dir)) {

144 - const char *exec_path = git_exec_path();

145 - template_dir = prefix_filename(exec_path, strlen(exec_path), template_dir);

144 + struct strbuf d = STRBUF_INIT;

145 + strbuf_addf(&d, "%s/%s", git_exec_path(), template_dir);

146 + template_dir = strbuf_detach(&d, NULL);

147 }

148 }

149 strcpy(template_path, template_dir);

config.c

+3 -4

@@ -484,10 +484,9 @@ const char *git_etc_gitconfig(void)

484 system_wide = ETC_GITCONFIG;

485 if (!is_absolute_path(system_wide)) {

486 /* interpret path relative to exec-dir */

487 - const char *exec_path = git_exec_path();

488 - system_wide = strdup(prefix_filename(exec_path,

489 - strlen(exec_path),

490 - system_wide));

487 + struct strbuf d = STRBUF_INIT;

488 + strbuf_addf(&d, "%s/%s", git_exec_path(), system_wide);

489 + system_wide = strbuf_detach(&d, NULL);

490 }

491 }

492 return system_wide;