From b7b1acfdbdd2e9dc2abacfa97679180f4c07b0c1 Mon Sep 17 00:00:00 2001 From: Sebastian Bauer Date: Sat, 12 Jan 2013 20:02:00 +0100 Subject: Clear local error variable after invoking giterr_clear(). --- src/repository.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/repository.c') diff --git a/src/repository.c b/src/repository.c index 46b7f8f48..2c567c892 100644 --- a/src/repository.c +++ b/src/repository.c @@ -1015,6 +1015,7 @@ static int repo_init_structure( /* if template was default, ignore error and use internal */ giterr_clear(); external_tpl = false; + error = 0; } } -- cgit v1.2.1 From 85f40312765f7d8df8d28a7dd61d7d5107071eeb Mon Sep 17 00:00:00 2001 From: Sebastian Bauer Date: Sun, 13 Jan 2013 11:30:05 +0100 Subject: Do not use GIT_CPDIR_CHMOD flag when copying the template. This is an intermin solution. While this essentially disables the --shared flag feature, previously external templates did not work at all. This change fixes the previously corrected, and since then failing, repo_init__extended_with_template() test. The problem is now documented in the source code comments. --- src/repository.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'src/repository.c') diff --git a/src/repository.c b/src/repository.c index 2c567c892..014b40aff 100644 --- a/src/repository.c +++ b/src/repository.c @@ -1005,8 +1005,17 @@ static int repo_init_structure( tdir = GIT_TEMPLATE_DIR; } + /* FIXME: GIT_CPDIR_CHMOD cannot applied here as an attempt + * would be made to chmod() all directories up to the last + * component of repo_dir, e.g., also /home etc. Recall that + * repo_dir is prettified at this point. + * + * Best probably would be to have the same logic as in + * git_futils_mkdir(), i.e., to separate the base from + * the path. + */ error = git_futils_cp_r(tdir, repo_dir, - GIT_CPDIR_COPY_SYMLINKS | GIT_CPDIR_CHMOD, dmode); + GIT_CPDIR_COPY_SYMLINKS /*| GIT_CPDIR_CHMOD*/, dmode); if (error < 0) { if (strcmp(tdir, GIT_TEMPLATE_DIR) != 0) -- cgit v1.2.1