proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 15:00:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make init.templatedir work

Browse Source
This commit is contained in:
Linquize 2013-09-18 23:06:10 +08:00
parent 3d4f169867
commit 0cd1c3bb06
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/repository.c
View File

@ -1132,44 +1132,39 @@ static int repo_init_structure(
/* Copy external template if requested */ /* Copy external template if requested */
if (external_tpl) { if (external_tpl) {
git_config *cfg; git_config *cfg = NULL;
const char *tdir; const char *tdir = NULL;
bool default_template = false;
git_buf template_buf = GIT_BUF_INIT; git_buf template_buf = GIT_BUF_INIT;
git_futils_find_template_dir(&template_buf);
if (opts->template_path) if (opts->template_path)
tdir = opts->template_path; tdir = opts->template_path;
else if ((error = git_config_open_default(&cfg)) < 0) else if ((error = git_config_open_default(&cfg)) >= 0) {
return error;
else {
error = git_config_get_string(&tdir, cfg, "init.templatedir"); error = git_config_get_string(&tdir, cfg, "init.templatedir");
git_config_free(cfg);
if (error && error != GIT_ENOTFOUND)
return error;
giterr_clear(); giterr_clear();
}
if (!tdir) {
git_futils_find_template_dir(&template_buf);
tdir = template_buf.ptr; tdir = template_buf.ptr;
default_template = true;
} }
error = git_futils_cp_r(tdir, repo_dir, error = git_futils_cp_r(tdir, repo_dir,
GIT_CPDIR_COPY_SYMLINKS | GIT_CPDIR_CHMOD_DIRS | GIT_CPDIR_COPY_SYMLINKS | GIT_CPDIR_CHMOD_DIRS |
GIT_CPDIR_SIMPLE_TO_MODE, dmode); GIT_CPDIR_SIMPLE_TO_MODE, dmode);
git_buf_free(&template_buf);
git_config_free(cfg);
if (error < 0) { if (error < 0) {
if (strcmp(tdir, template_buf.ptr) != 0) { if (!default_template)
git_buf_free(&template_buf);
return error; return error;
}
/* if template was default, ignore error and use internal */ /* if template was default, ignore error and use internal */
giterr_clear(); giterr_clear();
external_tpl = false; external_tpl = false;
error = 0; error = 0;
} }
git_buf_free(&template_buf);
} }
/* Copy internal template /* Copy internal template