diff options
| author | Vicent Martà <vicent@github.com> | 2013-01-06 18:56:40 -0800 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-01-06 18:56:40 -0800 |
| commit | 05e9fc583573c0709b997584ba839f9d643136cf (patch) | |
| tree | 1b9295b6cf42011fcc6b4a55094ac025abc5f8b8 | |
| parent | 7eb222fc7d392e8570e93373d7ffc7f67ea792cc (diff) | |
| parent | c31ae146b4fec2220db981465f2bde221fec1f72 (diff) | |
| download | libgit2-05e9fc583573c0709b997584ba839f9d643136cf.tar.gz | |
Merge pull request #1200 from ethomson/merge_cleanup
merge cleanup should actually cleanup and the test should actually test
| -rw-r--r-- | src/merge.c | 2 | ||||
| -rw-r--r-- | tests-clar/reset/hard.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/merge.c b/src/merge.c index f52c112c9..7eaa98a2c 100644 --- 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 6d2123e87..9bbce31ad 100644 --- 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"); |