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>

Junio C Hamano committed Feb 3, 2008 at 22:37 UTC 7a5375395f8104a8679f9482e0c5faf60e7e9e54

2 files changed +4 -4

builtin-init-db.c

+1 -2

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

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_path(exec_path, strlen(exec_path),

146 - template_dir);

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

146 }

147 }

148 strcpy(template_path, template_dir);

config.c

+3 -2

@@ -485,8 +485,9 @@ const char *git_etc_gitconfig(void)

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 = prefix_path(exec_path, strlen(exec_path),

489 - system_wide);

488 + system_wide = strdup(prefix_filename(exec_path,

489 + strlen(exec_path),

490 + system_wide));

491 }

492 }

493 return system_wide;