proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-07 16:22:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

stash: return GIT_EMERGECONFLICT on merge conflict

Browse Source
This commit is contained in:
Edward Thomson 2015-03-18 01:54:04 -04:00
parent 958950b6e0
commit f78bb2afb3
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/stash.c
View File

@ -738,10 +738,8 @@ int git_stash_apply(
&unstashed_index, repo, index_parent_tree, repo_index, index_tree)) < 0) &unstashed_index, repo, index_parent_tree, repo_index, index_tree)) < 0)
goto cleanup; goto cleanup;
/* TODO: GIT_EMERGECONFLICT */
if (git_index_has_conflicts(unstashed_index)) { if (git_index_has_conflicts(unstashed_index)) {
error = GIT_EUNMERGED; error = GIT_EMERGECONFLICT;
goto cleanup; goto cleanup;
} }
} }

2
tests/stash/apply.c
View File

@ -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_add_bypath(repo_index, "who"));
cl_git_pass(git_index_write(repo_index)); 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); cl_assert_equal_i(git_index_has_conflicts(repo_index), 0);
assert_status(repo, "what", GIT_STATUS_CURRENT); assert_status(repo, "what", GIT_STATUS_CURRENT);