diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2008-02-05 09:17:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-05 01:44:10 -0800 |
| commit | ef5b9d6e2286630bf8afb5bdf1c6e3356f3d50c7 (patch) | |
| tree | 98469bc91f8f147db82a9df883d37579a0c3c647 /builtin-init-db.c | |
| parent | 7a2078b4b00fb1c5d7b0bf8155778f79377b8f2f (diff) | |
| download | git-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 'builtin-init-db.c')
| -rw-r--r-- | builtin-init-db.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin-init-db.c b/builtin-init-db.c index e51d447761..5d7cdda933 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); |