diff options
| -rw-r--r-- | builtin-init-db.c | 5 | ||||
| -rw-r--r-- | config.c | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/builtin-init-db.c b/builtin-init-db.c index e51d44776..5d7cdda93 100644 --- a/builtin-init-db.c +++ b/builtin-init-db.c @@ -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; |