diff options
| author | nulltoken <emeric.fermas@gmail.com> | 2012-11-08 21:08:59 +0100 |
|---|---|---|
| committer | nulltoken <emeric.fermas@gmail.com> | 2012-11-08 21:16:48 +0100 |
| commit | 7cc1bf0fcb6de212dc50e02ff187880af9103bf4 (patch) | |
| tree | bf2800a5b62ac15881a0bc8670543bf7231f0ffd /tests-clar | |
| parent | 29cc374d2e8a73c458805f8e76a286b8b688b80e (diff) | |
| download | libgit2-7cc1bf0fcb6de212dc50e02ff187880af9103bf4.tar.gz | |
index: Introduce git_index_has_conflicts()
Diffstat (limited to 'tests-clar')
| -rw-r--r-- | tests-clar/index/conflicts.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests-clar/index/conflicts.c b/tests-clar/index/conflicts.c index 59df257c5..e101b1659 100644 --- a/tests-clar/index/conflicts.c +++ b/tests-clar/index/conflicts.c @@ -180,8 +180,12 @@ void test_index_conflicts__remove_all_conflicts(void) cl_assert(git_index_entrycount(repo_index) == 8); + cl_assert_equal_i(true, git_index_has_conflicts(repo_index)); + git_index_conflict_cleanup(repo_index); + cl_assert_equal_i(false, git_index_has_conflicts(repo_index)); + cl_assert(git_index_entrycount(repo_index) == 2); for (i = 0; i < git_index_entrycount(repo_index); i++) { |