Commit 002821837f0dd8d57c6c03b11159dff060cb1982
2015-12-26T22:32:17
repo::init tests: test a template dir with leading dot Ensure that we can handle template directories that begin with a leading dot.
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
diff --git a/tests/repo/init.c b/tests/repo/init.c
index fb8b863..b06a813 100644
--- a/tests/repo/init.c
+++ b/tests/repo/init.c
@@ -12,6 +12,7 @@ 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)
@@ -33,6 +34,10 @@ 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)
@@ -544,14 +549,14 @@ static void configure_templatedir(const char *template_path)
git_buf config_data = GIT_BUF_INIT;
cl_git_pass(git_libgit2_opts(GIT_OPT_GET_SEARCH_PATH,
- GIT_CONFIG_LEVEL_GLOBAL, &config_path));
- cl_git_pass(git_buf_puts(&config_path, ".tmp"));
+ 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, config_path.ptr));
+ GIT_CONFIG_LEVEL_GLOBAL, _tmp_path.ptr));
- cl_must_pass(p_mkdir(config_path.ptr, 0777));
+ cl_must_pass(p_mkdir(_tmp_path.ptr, 0777));
- cl_git_pass(git_buf_joinpath(&config_path, config_path.ptr, ".gitconfig"));
+ 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));
@@ -636,16 +641,39 @@ void test_repo_init__external_templates_specified_in_config(void)
cl_git_pass(git_repository_init_ext(&_repo, "templated.git", &opts));
- cl_assert(git_repository_is_bare(_repo));
-
- cl_assert(!git__suffixcmp(git_repository_path(_repo), "/templated.git/"));
-
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_repository_init_options opts = GIT_REPOSITORY_INIT_OPTIONS_INIT;