diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-02-18 23:16:05 +0300 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-11 21:12:12 +0300 |
| commit | d0dd3fcee7943321784f5745d34130cacd5d9fb4 (patch) | |
| tree | 48a8503b2147e82bf8d39e93ccc07b276ac53a54 /tests/stash | |
| parent | 7f26b1b9cfcf07a820503dc7597c24914514a242 (diff) | |
stash apply: check out a tree, not piecewise
Diffstat (limited to 'tests/stash')
| -rw-r--r-- | tests/stash/apply.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/stash/apply.c b/tests/stash/apply.c index 5f3cc9a16..c0cdcabb9 100644 --- a/tests/stash/apply.c +++ b/tests/stash/apply.c @@ -121,7 +121,7 @@ void test_stash_apply__conflict_untracked_with_default(void) { cl_git_mkfile("stash/when", "nothing\n"); - cl_git_fail_with(git_stash_apply(repo, 0, GIT_APPLY_DEFAULT), GIT_EEXISTS); + cl_git_fail_with(git_stash_apply(repo, 0, GIT_APPLY_DEFAULT), GIT_EMERGECONFLICT); cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); assert_status(repo, "what", GIT_STATUS_CURRENT); @@ -134,7 +134,7 @@ void test_stash_apply__conflict_untracked_with_reinstate_index(void) { cl_git_mkfile("stash/when", "nothing\n"); - cl_git_fail_with(git_stash_apply(repo, 0, GIT_APPLY_REINSTATE_INDEX), GIT_EEXISTS); + cl_git_fail_with(git_stash_apply(repo, 0, GIT_APPLY_REINSTATE_INDEX), GIT_EMERGECONFLICT); cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); assert_status(repo, "what", GIT_STATUS_CURRENT); |