diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-14 14:00:29 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:44:02 -0400 |
| commit | 7c948014006e86beaced3e77b61cb0a8ddb0958c (patch) | |
| tree | f7dc1c8dd846d9ecac6c2f5ff4e5c086f918a670 /tests | |
| parent | d67f270e58942fed5871eca6802d3fa4f290e4f1 (diff) | |
| download | libgit2-7c948014006e86beaced3e77b61cb0a8ddb0958c.tar.gz | |
diff/status: introduce conflicts
When diffing against an index, return a new `GIT_DELTA_CONFLICTED`
delta type for items that are conflicted. For a single file path,
only one delta will be produced (despite the fact that there are
multiple entries in the index).
Index iterators now have the (optional) ability to return conflicts
in the index. Prior to this change, they would be omitted, and callers
(like diff) would omit conflicted index entries entirely.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/status/worktree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/status/worktree.c b/tests/status/worktree.c index de21a1c31..9be0a4172 100644 --- a/tests/status/worktree.c +++ b/tests/status/worktree.c @@ -487,7 +487,7 @@ void test_status_worktree__conflict_with_diff3(void) cl_git_pass(git_status_file(&status, repo, "modified_file")); - cl_assert_equal_i(GIT_STATUS_INDEX_DELETED | GIT_STATUS_WT_NEW, status); + cl_assert_equal_i(GIT_STATUS_CONFLICTED, status); } static const char *filemode_paths[] = { @@ -640,7 +640,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_INDEX_DELETED|GIT_STATUS_WT_NEW, status); + cl_assert_equal_i(GIT_STATUS_CONFLICTED, status); git_index_free(index); } |