diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2012-10-23 16:32:01 -0500 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2012-10-24 20:24:37 -0500 |
| commit | 03bdb2addd02948e0e42b509e5c26c6eb5e7e1de (patch) | |
| tree | 886a12f4ff2390f21f9fb3c6e9c15a1781875521 /tests-clar | |
| parent | 632d8b230bf38cc61cd70b55a54ae2f52502b4af (diff) | |
| download | libgit2-03bdb2addd02948e0e42b509e5c26c6eb5e7e1de.tar.gz | |
GIT_EUNMERGED
Diffstat (limited to 'tests-clar')
| -rw-r--r-- | tests-clar/reset/soft.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests-clar/reset/soft.c b/tests-clar/reset/soft.c index 6796c80bc..fa206455d 100644 --- a/tests-clar/reset/soft.c +++ b/tests-clar/reset/soft.c @@ -120,6 +120,8 @@ void test_reset_soft__fails_when_merging(void) cl_git_pass(git_buf_joinpath(&merge_head_path, git_repository_path(repo), "MERGE_HEAD")); cl_git_mkfile(git_buf_cstr(&merge_head_path), "beefbeefbeefbeefbeefbeefbeefbeefbeefbeef\n"); - cl_git_fail(git_reset(repo, target, GIT_RESET_SOFT)); + retrieve_target_from_oid(&target, repo, KNOWN_COMMIT_IN_BARE_REPO); + + cl_assert_equal_i(GIT_EUNMERGED, git_reset(repo, target, GIT_RESET_SOFT)); cl_git_pass(p_unlink(git_buf_cstr(&merge_head_path))); } |