Commit 2c9ed02eae0a3df9650fb5834303a72dda098e55
2013-09-20T09:22:19
Merge pull request #1859 from linquize/init.templatedir Make init.templatedir work
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/src/repository.c b/src/repository.c
index d1b7d91..6dea487 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -1132,44 +1132,39 @@ static int repo_init_structure(
/* Copy external template if requested */
if (external_tpl) {
- git_config *cfg;
- const char *tdir;
+ git_config *cfg = NULL;
+ const char *tdir = NULL;
+ bool default_template = false;
git_buf template_buf = GIT_BUF_INIT;
- git_futils_find_template_dir(&template_buf);
-
if (opts->template_path)
tdir = opts->template_path;
- else if ((error = git_config_open_default(&cfg)) < 0)
- return error;
- else {
+ else if ((error = git_config_open_default(&cfg)) >= 0) {
error = git_config_get_string(&tdir, cfg, "init.templatedir");
-
- git_config_free(cfg);
-
- if (error && error != GIT_ENOTFOUND)
- return error;
-
giterr_clear();
- tdir = template_buf.ptr;
+ }
+
+ if (!tdir) {
+ if ((error = git_futils_find_template_dir(&template_buf)) >= 0);
+ tdir = template_buf.ptr;
+ default_template = true;
}
error = git_futils_cp_r(tdir, repo_dir,
GIT_CPDIR_COPY_SYMLINKS | GIT_CPDIR_CHMOD_DIRS |
GIT_CPDIR_SIMPLE_TO_MODE, dmode);
+ git_buf_free(&template_buf);
+ git_config_free(cfg);
if (error < 0) {
- if (strcmp(tdir, template_buf.ptr) != 0) {
- git_buf_free(&template_buf);
+ if (!default_template)
return error;
- }
/* if template was default, ignore error and use internal */
giterr_clear();
external_tpl = false;
error = 0;
}
- git_buf_free(&template_buf);
}
/* Copy internal template