Merge pull request #3565 from ethomson/templates Handle dotfiles as the repo template dir and inside the template dir
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 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262
diff --git a/src/repository.c b/src/repository.c
index 6234cd5..8a6fef0 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -1438,7 +1438,9 @@ static int repo_init_structure(
}
if (tdir) {
- uint32_t cpflags = GIT_CPDIR_COPY_SYMLINKS | GIT_CPDIR_SIMPLE_TO_MODE;
+ uint32_t cpflags = GIT_CPDIR_COPY_SYMLINKS |
+ GIT_CPDIR_SIMPLE_TO_MODE |
+ GIT_CPDIR_COPY_DOTFILES;
if (opts->mode != GIT_REPOSITORY_INIT_SHARED_UMASK)
cpflags |= GIT_CPDIR_CHMOD_DIRS;
error = git_futils_cp_r(tdir, repo_dir, cpflags, dmode);
diff --git a/tests/repo/init.c b/tests/repo/init.c
index 7a9ec20..04d4a5c 100644
--- a/tests/repo/init.c
+++ b/tests/repo/init.c
@@ -11,6 +11,8 @@ enum repo_mode {
};
static git_repository *_repo = NULL;
+static git_buf _global_path = GIT_BUF_INIT;
+static git_buf _tmp_path = GIT_BUF_INIT;
static mode_t g_umask = 0;
void test_repo_init__initialize(void)
@@ -22,6 +24,20 @@ void test_repo_init__initialize(void)
g_umask = p_umask(022);
(void)p_umask(g_umask);
}
+
+ git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL,
+ &_global_path);
+}
+
+void test_repo_init__cleanup(void)
+{
+ git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL,
+ _global_path.ptr);
+ git_buf_free(&_global_path);
+
+ if (_tmp_path.size > 0 && git_path_isdir(_tmp_path.ptr))
+ git_futils_rmdir_r(_tmp_path.ptr, NULL, GIT_RMDIR_REMOVE_FILES);
+ git_buf_free(&_tmp_path);
}
static void cleanup_repository(void *path)
@@ -503,7 +519,8 @@ static void assert_mode_seems_okay(
static const char *template_sandbox(const char *name)
{
- git_buf hooks_path = GIT_BUF_INIT, link_path = GIT_BUF_INIT;
+ git_buf hooks_path = GIT_BUF_INIT, link_path = GIT_BUF_INIT,
+ dotfile_path = GIT_BUF_INIT;
const char *path = cl_fixture(name);
cl_fixture_sandbox(name);
@@ -521,19 +538,84 @@ static const char *template_sandbox(const char *name)
cl_must_pass(symlink("update.sample", link_path.ptr));
#endif
+ /* create a file starting with a dot */
+ cl_git_pass(git_buf_joinpath(&dotfile_path, hooks_path.ptr, ".dotfile"));
+ cl_git_mkfile(dotfile_path.ptr, "something\n");
+ git_buf_free(&dotfile_path);
+
+ git_buf_free(&dotfile_path);
git_buf_free(&link_path);
git_buf_free(&hooks_path);
return path;
}
-void test_repo_init__extended_with_template(void)
+static void configure_templatedir(const char *template_path)
+{
+ git_buf config_path = GIT_BUF_INIT;
+ git_buf config_data = GIT_BUF_INIT;
+
+ cl_git_pass(git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH,
+ GIT_CONFIG_LEVEL_GLOBAL, &_tmp_path));
+ cl_git_pass(git_buf_puts(&_tmp_path, ".tmp"));
+ cl_git_pass(git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH,
+ GIT_CONFIG_LEVEL_GLOBAL, _tmp_path.ptr));
+
+ cl_must_pass(p_mkdir(_tmp_path.ptr, 0777));
+
+ cl_git_pass(git_buf_joinpath(&config_path, _tmp_path.ptr, ".gitconfig"));
+
+ cl_git_pass(git_buf_printf(&config_data,
+ "[init]\n\ttemplatedir = \"%s\"\n", template_path));
+
+ cl_git_mkfile(config_path.ptr, config_data.ptr);
+
+ git_buf_free(&config_path);
+ git_buf_free(&config_data);
+}
+
+static void validate_templates(git_repository *repo, const char *template_path)
{
+ git_buf template_description = GIT_BUF_INIT;
+ git_buf repo_description = GIT_BUF_INIT;
git_buf expected = GIT_BUF_INIT;
git_buf actual = GIT_BUF_INIT;
- git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
int filemode;
+ cl_git_pass(git_buf_joinpath(&template_description, template_path,
+ "description"));
+ cl_git_pass(git_buf_joinpath(&repo_description, git_repository_path(repo),
+ "description"));
+
+ cl_git_pass(git_futils_readbuffer(&expected, template_description.ptr));
+ cl_git_pass(git_futils_readbuffer(&actual, repo_description.ptr));
+
+ cl_assert_equal_s(expected.ptr, actual.ptr);
+
+ filemode = cl_repo_get_bool(repo, "core.filemode");
+
+ assert_hooks_match(
+ template_path, git_repository_path(repo),
+ "hooks/update.sample", filemode);
+
+ assert_hooks_match(
+ template_path, git_repository_path(repo),
+ "hooks/link.sample", filemode);
+
+ assert_hooks_match(
+ template_path, git_repository_path(repo),
+ "hooks/.dotfile", filemode);
+
+ git_buf_free(&expected);
+ git_buf_free(&actual);
+ git_buf_free(&repo_description);
+ git_buf_free(&template_description);
+}
+
+void test_repo_init__external_templates_specified_in_options(void)
+{
+ git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
+
cl_set_cleanup(&cleanup_repository, "templated.git");
template_sandbox("template");
@@ -547,32 +629,64 @@ void test_repo_init__extended_with_template(void)
cl_assert(!git__suffixcmp(git_repository_path(_repo), "/templated.git/"));
- cl_git_pass(git_futils_readbuffer(&expected, "template/description"));
- cl_git_pass(git_futils_readbuffer(
- &actual, "templated.git/description"));
+ validate_templates(_repo, "template");
+ cl_fixture_cleanup("template");
+}
- cl_assert_equal_s(expected.ptr, actual.ptr);
+void test_repo_init__external_templates_specified_in_config(void)
+{
+ git_buf template_path = GIT_BUF_INIT;
- git_buf_free(&expected);
- git_buf_free(&actual);
+ git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
- filemode = cl_repo_get_bool(_repo, "core.filemode");
+ cl_set_cleanup(&cleanup_repository, "templated.git");
+ template_sandbox("template");
- assert_hooks_match(
- "template", git_repository_path(_repo),
- "hooks/update.sample", filemode);
+ cl_git_pass(git_buf_joinpath(&template_path, clar_sandbox_path(),
+ "template"));
- assert_hooks_match(
- "template", git_repository_path(_repo),
- "hooks/link.sample", filemode);
+ configure_templatedir(template_path.ptr);
+
+ opts.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_BARE |
+ GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE;
+
+ cl_git_pass(git_repository_init_ext(&_repo, "templated.git", &opts));
+ validate_templates(_repo, "template");
cl_fixture_cleanup("template");
+
+ git_buf_free(&template_path);
+}
+
+void test_repo_init__external_templates_with_leading_dot(void)
+{
+ git_buf template_path = GIT_BUF_INIT;
+
+ git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
+
+ cl_set_cleanup(&cleanup_repository, "templated.git");
+ template_sandbox("template");
+
+ cl_must_pass(p_rename("template", ".template_with_leading_dot"));
+
+ cl_git_pass(git_buf_joinpath(&template_path, clar_sandbox_path(),
+ ".template_with_leading_dot"));
+
+ configure_templatedir(template_path.ptr);
+
+ opts.flags = GIT_REPOSITORY_INIT_MKPATH | GIT_REPOSITORY_INIT_BARE |
+ GIT_REPOSITORY_INIT_EXTERNAL_TEMPLATE;
+
+ cl_git_pass(git_repository_init_ext(&_repo, "templated.git", &opts));
+
+ validate_templates(_repo, ".template_with_leading_dot");
+ cl_fixture_cleanup(".template_with_leading_dot");
+
+ git_buf_free(&template_path);
}
void test_repo_init__extended_with_template_and_shared_mode(void)
{
- git_buf expected = GIT_BUF_INIT;
- git_buf actual = GIT_BUF_INIT;
git_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;
int filemode = true;
const char *repo_path = NULL;
@@ -592,16 +706,6 @@ void test_repo_init__extended_with_template_and_shared_mode(void)
filemode = cl_repo_get_bool(_repo, "core.filemode");
- cl_git_pass(git_futils_readbuffer(
- &expected, "template/description"));
- cl_git_pass(git_futils_readbuffer(
- &actual, "init_shared_from_tpl/.git/description"));
-
- cl_assert_equal_s(expected.ptr, actual.ptr);
-
- git_buf_free(&expected);
- git_buf_free(&actual);
-
repo_path = git_repository_path(_repo);
assert_mode_seems_okay(repo_path, "hooks",
GIT_FILEMODE_TREE | GIT_REPOSITORY_INIT_SHARED_GROUP, true, filemode);
@@ -610,17 +714,7 @@ void test_repo_init__extended_with_template_and_shared_mode(void)
assert_mode_seems_okay(repo_path, "description",
GIT_FILEMODE_BLOB, false, filemode);
- /* for a non-symlinked hook, it should have shared permissions now */
- assert_hooks_match(
- "template", git_repository_path(_repo),
- "hooks/update.sample", filemode);
-
- /* for a symlinked hook, the permissions still should match the
- * source link, not the GIT_REPOSITORY_INIT_SHARED_GROUP value
- */
- assert_hooks_match(
- "template", git_repository_path(_repo),
- "hooks/link.sample", filemode);
+ validate_templates(_repo, "template");
cl_fixture_cleanup("template");
}