Commit db62807215cbe26b83a354954b7433aa5d90c149
2012-05-11T12:16:19
Fixed leaks and added tests
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
diff --git a/src/repository.c b/src/repository.c
index 9031c59..c5eed53 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -713,31 +713,28 @@ static int repo_write_template(
const char *git_dir, const char *file, mode_t mode, const char *content)
{
git_buf path = GIT_BUF_INIT;
- int fd;
+ int fd, error = 0;
if (git_buf_joinpath(&path, git_dir, file) < 0)
return -1;
fd = p_open(git_buf_cstr(&path), O_WRONLY | O_CREAT | O_EXCL, mode);
- if (fd < 0) {
- git_buf_free(&path);
- if (errno == EEXIST)
- return 0;
- goto fail;
- }
-
- if (p_write(fd, content, strlen(content)) < 0)
- goto fail;
- p_close(fd);
+ if (fd >= 0) {
+ error = p_write(fd, content, strlen(content));
- return 0;
+ p_close(fd);
+ }
+ else if (errno != EEXIST)
+ error = fd;
-fail:
git_buf_free(&path);
- giterr_set(GITERR_OS,
- "Failed to initialize repository with template '%s'", file);
- return -1;
+
+ if (error)
+ giterr_set(GITERR_OS,
+ "Failed to initialize repository with template '%s'", file);
+
+ return error;
}
static int repo_init_structure(const char *git_dir, int is_bare)
diff --git a/tests-clar/repo/init.c b/tests-clar/repo/init.c
index a12a2c2..7f16b5b 100644
--- a/tests-clar/repo/init.c
+++ b/tests-clar/repo/init.c
@@ -141,3 +141,27 @@ void test_repo_init__reinit_too_recent_bare_repo(void)
cl_fixture_cleanup("reinit.git");
}
+
+void test_repo_init__additional_templates(void)
+{
+ git_buf path = GIT_BUF_INIT;
+
+ cl_set_cleanup(&cleanup_repository, "tester");
+
+ ensure_repository_init("tester", 0, "tester/.git/", "tester/");
+
+ cl_git_pass(
+ git_buf_joinpath(&path, git_repository_path(_repo), "description"));
+ cl_assert(git_path_isfile(git_buf_cstr(&path)));
+
+ cl_git_pass(
+ git_buf_joinpath(&path, git_repository_path(_repo), "info/exclude"));
+ cl_assert(git_path_isfile(git_buf_cstr(&path)));
+
+ cl_git_pass(
+ git_buf_joinpath(&path, git_repository_path(_repo), "hooks"));
+ cl_assert(git_path_isdir(git_buf_cstr(&path)));
+ /* won't confirm specific contents of hooks dir since it may vary */
+
+ git_buf_free(&path);
+}