merge cleanup should actually cleanup and the test should actually test

diff --git a/src/merge.c b/src/merge.c
index f52c112c90e0f66662e52a1cd23fe302a5c96a0d..7eaa98a2ccf15be292ae8f88a0a2dab52cfb0bed 100644 (file)
--- a/src/merge.c
+++ b/src/merge.c
@@ -26,7 +26,7 @@ int git_repository_merge_cleanup(git_repository *repo)
 
        if (git_buf_joinpath(&merge_head_path, repo->path_repository, GIT_MERGE_HEAD_FILE) < 0 ||
                git_buf_joinpath(&merge_mode_path, repo->path_repository, GIT_MERGE_MODE_FILE) < 0 ||
-               git_buf_joinpath(&merge_mode_path, repo->path_repository, GIT_MERGE_MODE_FILE) < 0)
+               git_buf_joinpath(&merge_msg_path, repo->path_repository, GIT_MERGE_MSG_FILE) < 0)
                return -1;
 
        if (git_path_isfile(merge_head_path.ptr)) {

diff --git a/tests-clar/reset/hard.c b/tests-clar/reset/hard.c
index 6d2123e87f852e71956908e8b479b563de3c1e53..9bbce31ad80b5c896205735e47d6d3861fa334e8 100644 (file)
--- a/tests-clar/reset/hard.c
+++ b/tests-clar/reset/hard.c
@@ -111,10 +111,10 @@ void test_reset_hard__cleans_up_merge(void)
        cl_git_mkfile(git_buf_cstr(&merge_head_path), "beefbeefbeefbeefbeefbeefbeefbeefbeefbeef\n");
 
        cl_git_pass(git_buf_joinpath(&merge_msg_path, git_repository_path(repo), "MERGE_MSG"));
-       cl_git_mkfile(git_buf_cstr(&merge_head_path), "Merge commit 0017bd4ab1ec30440b17bae1680cff124ab5f1f6\n");
+       cl_git_mkfile(git_buf_cstr(&merge_msg_path), "Merge commit 0017bd4ab1ec30440b17bae1680cff124ab5f1f6\n");
 
-       cl_git_pass(git_buf_joinpath(&merge_msg_path, git_repository_path(repo), "MERGE_MODE"));
-       cl_git_mkfile(git_buf_cstr(&merge_head_path), "");
+       cl_git_pass(git_buf_joinpath(&merge_mode_path, git_repository_path(repo), "MERGE_MODE"));
+       cl_git_mkfile(git_buf_cstr(&merge_mode_path), "");
 
        cl_git_pass(git_buf_joinpath(&orig_head_path, git_repository_path(repo), "ORIG_HEAD"));
        cl_git_mkfile(git_buf_cstr(&orig_head_path), "0017bd4ab1ec30440b17bae1680cff124ab5f1f6");