From f78bb2afb3a7f23264c4adf2e9debfa415ca8107 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Wed, 18 Mar 2015 01:54:04 -0400 Subject: [PATCH] stash: return GIT_EMERGECONFLICT on merge conflict --- src/stash.c | 4 +--- tests/stash/apply.c | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/stash.c b/src/stash.c index d53c22c4d..e3e025771 100644 --- a/src/stash.c +++ b/src/stash.c @@ -738,10 +738,8 @@ int git_stash_apply( &unstashed_index, repo, index_parent_tree, repo_index, index_tree)) < 0) goto cleanup; - - /* TODO: GIT_EMERGECONFLICT */ if (git_index_has_conflicts(unstashed_index)) { - error = GIT_EUNMERGED; + error = GIT_EMERGECONFLICT; goto cleanup; } } diff --git a/tests/stash/apply.c b/tests/stash/apply.c index efe7852b8..74416cd95 100644 --- a/tests/stash/apply.c +++ b/tests/stash/apply.c @@ -108,7 +108,7 @@ void test_stash_apply__conflict_index_with_reinstate_index(void) cl_git_pass(git_index_add_bypath(repo_index, "who")); cl_git_pass(git_index_write(repo_index)); - cl_git_fail_with(git_stash_apply(repo, 0, NULL, GIT_APPLY_REINSTATE_INDEX), GIT_EUNMERGED); + cl_git_fail_with(git_stash_apply(repo, 0, NULL, GIT_APPLY_REINSTATE_INDEX), GIT_EMERGECONFLICT); cl_assert_equal_i(git_index_has_conflicts(repo_index), 0); assert_status(repo, "what", GIT_STATUS_CURRENT);