diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-01-06 18:38:29 -0600 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-01-06 18:38:29 -0600 |
| commit | c31ae146b4fec2220db981465f2bde221fec1f72 (patch) | |
| tree | 1b9295b6cf42011fcc6b4a55094ac025abc5f8b8 /tests-clar | |
| parent | 7eb222fc7d392e8570e93373d7ffc7f67ea792cc (diff) | |
| download | libgit2-c31ae146b4fec2220db981465f2bde221fec1f72.tar.gz | |
merge cleanup should actually cleanup and the test should actually test
Diffstat (limited to 'tests-clar')
| -rw-r--r-- | tests-clar/reset/hard.c | 6 |
1 files changed, 3 insertions, 3 deletions
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"); |