1 files changed, 13 insertions, 26 deletions

diff --git a/tests/repo/message.c b/tests/repo/message.c
index 629d40c12..87574590b 100644
--- a/tests/repo/message.c
+++ b/tests/repo/message.c
@@ -4,49 +4,36 @@
 #include "posix.h"
 
 static git_repository *_repo;
-static git_buf _path;
-static char *_actual;
 
 void test_repo_message__initialize(void)
 {
-        _repo = cl_git_sandbox_init("testrepo.git");
+	_repo = cl_git_sandbox_init("testrepo.git");
 }
 
 void test_repo_message__cleanup(void)
 {
-        cl_git_sandbox_cleanup();
-	git_buf_free(&_path);
-	git__free(_actual);
-	_actual = NULL;
+	cl_git_sandbox_cleanup();
 }
 
 void test_repo_message__none(void)
 {
-	cl_assert_equal_i(GIT_ENOTFOUND, git_repository_message(NULL, 0, _repo));
+	git_buf actual = GIT_BUF_INIT;
+	cl_assert_equal_i(GIT_ENOTFOUND, git_repository_message(&actual, _repo));
 }
 
 void test_repo_message__message(void)
 {
+	git_buf path = GIT_BUF_INIT, actual = GIT_BUF_INIT;
 	const char expected[] = "Test\n\nThis is a test of the emergency broadcast system\n";
-	ssize_t len;
 
-	cl_git_pass(git_buf_joinpath(&_path, git_repository_path(_repo), "MERGE_MSG"));
-	cl_git_mkfile(git_buf_cstr(&_path), expected);
+	cl_git_pass(git_buf_joinpath(&path, git_repository_path(_repo), "MERGE_MSG"));
+	cl_git_mkfile(git_buf_cstr(&path), expected);
 
-	len = git_repository_message(NULL, 0, _repo);
-	cl_assert(len > 0);
+	cl_git_pass(git_repository_message(&actual, _repo));
+	cl_assert_equal_s(expected, git_buf_cstr(&actual));
+	git_buf_free(&actual);
 
-	_actual = git__malloc(len + 1);
-	cl_assert(_actual != NULL);
-
-	/* Test non truncation */
-	cl_assert(git_repository_message(_actual, len, _repo) > 0);
-	cl_assert_equal_s(expected, _actual);
-
-	/* Test truncation and that trailing NUL is inserted */
-	cl_assert(git_repository_message(_actual, 6, _repo) > 0);
-	cl_assert_equal_s("Test\n", _actual);
-
-	cl_git_pass(p_unlink(git_buf_cstr(&_path)));
-	cl_assert_equal_i(GIT_ENOTFOUND, git_repository_message(NULL, 0, _repo));
+	cl_git_pass(p_unlink(git_buf_cstr(&path)));
+	cl_assert_equal_i(GIT_ENOTFOUND, git_repository_message(&actual, _repo));
+	git_buf_free(&path);
 }