diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-14 11:52:48 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:43:49 -0400 |
| commit | ecd60a56ebd6bdc347a486f53da7de0febef58cf (patch) | |
| tree | efea34ffa8b81deab7f186756222035e3ed1f2af /tests/status | |
| parent | 1b6c26db976596e74ddaf5da8d0f43a63ccee063 (diff) | |
| download | libgit2-ecd60a56ebd6bdc347a486f53da7de0febef58cf.tar.gz | |
conflicts: when adding conflicts, remove staged
When adding a conflict for some path, remove the staged entry.
Otherwise, an illegal index (with both stage 0 and high-stage
entries) would result.
Diffstat (limited to 'tests/status')
| -rw-r--r-- | tests/status/worktree.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/status/worktree.c b/tests/status/worktree.c index 8897bf9b5..a8d71477e 100644 --- a/tests/status/worktree.c +++ b/tests/status/worktree.c @@ -634,7 +634,7 @@ void test_status_worktree__conflicted_item(void) &our_entry, &their_entry)); cl_git_pass(git_status_file(&status, repo, "modified_file")); - cl_assert_equal_i(GIT_STATUS_WT_MODIFIED, status); + cl_assert_equal_i(GIT_STATUS_INDEX_DELETED|GIT_STATUS_WT_NEW, status); git_index_free(index); } |