summaryrefslogtreecommitdiff
path: root/tests/index
diff options
context:
space:
mode:
Diffstat (limited to 'tests/index')
-rw-r--r--tests/index/bypath.c4
-rw-r--r--tests/index/collision.c10
-rw-r--r--tests/index/conflicts.c38
-rw-r--r--tests/index/filemodes.c6
-rw-r--r--tests/index/names.c6
-rw-r--r--tests/index/racy.c24
-rw-r--r--tests/index/read_index.c6
-rw-r--r--tests/index/reuc.c6
-rw-r--r--tests/index/tests.c12
9 files changed, 56 insertions, 56 deletions
diff --git a/tests/index/bypath.c b/tests/index/bypath.c
index 34a7412a8..f911ffb51 100644
--- a/tests/index/bypath.c
+++ b/tests/index/bypath.c
@@ -285,7 +285,7 @@ void test_index_bypath__add_honors_conflict_mode(void)
cl_git_pass(git_index_remove_bypath(g_idx, "README.txt"));
for (stage = 1; stage <= 3; stage++) {
- new_entry.flags = stage << GIT_IDXENTRY_STAGESHIFT;
+ new_entry.flags = stage << GIT_INDEX_ENTRY_STAGESHIFT;
cl_git_pass(git_index_add(g_idx, &new_entry));
}
@@ -317,7 +317,7 @@ void test_index_bypath__add_honors_conflict_case(void)
cl_git_pass(git_index_remove_bypath(g_idx, "README.txt"));
for (stage = 1; stage <= 3; stage++) {
- new_entry.flags = stage << GIT_IDXENTRY_STAGESHIFT;
+ new_entry.flags = stage << GIT_INDEX_ENTRY_STAGESHIFT;
cl_git_pass(git_index_add(g_idx, &new_entry));
}
diff --git a/tests/index/collision.c b/tests/index/collision.c
index 699c985fe..e9af2cfe4 100644
--- a/tests/index/collision.c
+++ b/tests/index/collision.c
@@ -108,7 +108,7 @@ void test_index_collision__add_with_highstage_1(void)
git_oid_cpy(&entry.id, &g_empty_id);
entry.path = "a/b";
- GIT_IDXENTRY_STAGE_SET(&entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 2);
cl_git_pass(git_index_add(g_index, &entry));
/* create a blob beneath the previous tree entry */
@@ -118,7 +118,7 @@ void test_index_collision__add_with_highstage_1(void)
/* create another tree entry above the blob */
entry.path = "a/b";
- GIT_IDXENTRY_STAGE_SET(&entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 1);
cl_git_pass(git_index_add(g_index, &entry));
}
@@ -134,16 +134,16 @@ void test_index_collision__add_with_highstage_2(void)
git_oid_cpy(&entry.id, &g_empty_id);
entry.path = "a/b/c";
- GIT_IDXENTRY_STAGE_SET(&entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 1);
cl_git_pass(git_index_add(g_index, &entry));
/* create a blob beneath the previous tree entry */
entry.path = "a/b/c";
- GIT_IDXENTRY_STAGE_SET(&entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 2);
cl_git_pass(git_index_add(g_index, &entry));
/* create another tree entry above the blob */
entry.path = "a/b";
- GIT_IDXENTRY_STAGE_SET(&entry, 3);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 3);
cl_git_pass(git_index_add(g_index, &entry));
}
diff --git a/tests/index/conflicts.c b/tests/index/conflicts.c
index 27fbe2b05..41d0e219c 100644
--- a/tests/index/conflicts.c
+++ b/tests/index/conflicts.c
@@ -36,17 +36,17 @@ void test_index_conflicts__add(void)
ancestor_entry.path = "test-one.txt";
ancestor_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 1);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
our_entry.path = "test-one.txt";
our_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&our_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, 2);
git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID);
their_entry.path = "test-one.txt";
their_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 2);
git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID);
cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry));
@@ -67,17 +67,17 @@ void test_index_conflicts__add_fixes_incorrect_stage(void)
ancestor_entry.path = "test-one.txt";
ancestor_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 3);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 3);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
our_entry.path = "test-one.txt";
our_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&our_entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, 1);
git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID);
their_entry.path = "test-one.txt";
their_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&their_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&their_entry, 2);
git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID);
cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry));
@@ -110,17 +110,17 @@ void test_index_conflicts__add_detects_invalid_filemode(void)
for (i = 0; i < 3; i++) {
ancestor_entry.path = "test-one.txt";
ancestor_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 3);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 3);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
our_entry.path = "test-one.txt";
our_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&our_entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, 1);
git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID);
their_entry.path = "test-one.txt";
their_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&their_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&their_entry, 2);
git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID);
/* Corrupt the conflict entry's mode */
@@ -150,17 +150,17 @@ void test_index_conflicts__add_removes_stage_zero(void)
ancestor_entry.path = "test-one.txt";
ancestor_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 3);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 3);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
our_entry.path = "test-one.txt";
our_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&our_entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, 1);
git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID);
their_entry.path = "test-one.txt";
their_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&their_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&their_entry, 2);
git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID);
cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, &our_entry, &their_entry));
@@ -356,7 +356,7 @@ void test_index_conflicts__partial(void)
ancestor_entry.path = "test-one.txt";
ancestor_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 1);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
cl_git_pass(git_index_conflict_add(repo_index, &ancestor_entry, NULL, NULL));
@@ -386,17 +386,17 @@ void test_index_conflicts__case_matters(void)
memset(&their_entry, 0x0, sizeof(git_index_entry));
ancestor_entry.path = upper_case;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_ONE_ANCESTOR_OID);
ancestor_entry.mode = GIT_FILEMODE_BLOB;
our_entry.path = upper_case;
- GIT_IDXENTRY_STAGE_SET(&our_entry, GIT_INDEX_STAGE_OURS);
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, GIT_INDEX_STAGE_OURS);
git_oid_fromstr(&our_entry.id, CONFLICTS_ONE_OUR_OID);
our_entry.mode = GIT_FILEMODE_BLOB;
their_entry.path = upper_case;
- GIT_IDXENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS);
+ GIT_INDEX_ENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS);
git_oid_fromstr(&their_entry.id, CONFLICTS_ONE_THEIR_OID);
their_entry.mode = GIT_FILEMODE_BLOB;
@@ -404,17 +404,17 @@ void test_index_conflicts__case_matters(void)
&ancestor_entry, &our_entry, &their_entry));
ancestor_entry.path = mixed_case;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
git_oid_fromstr(&ancestor_entry.id, CONFLICTS_TWO_ANCESTOR_OID);
ancestor_entry.mode = GIT_FILEMODE_BLOB;
our_entry.path = mixed_case;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, GIT_INDEX_STAGE_ANCESTOR);
git_oid_fromstr(&our_entry.id, CONFLICTS_TWO_OUR_OID);
ancestor_entry.mode = GIT_FILEMODE_BLOB;
their_entry.path = mixed_case;
- GIT_IDXENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS);
+ GIT_INDEX_ENTRY_STAGE_SET(&their_entry, GIT_INDEX_STAGE_THEIRS);
git_oid_fromstr(&their_entry.id, CONFLICTS_TWO_THEIR_OID);
their_entry.mode = GIT_FILEMODE_BLOB;
diff --git a/tests/index/filemodes.c b/tests/index/filemodes.c
index 4eadb2c34..4e5a6df3b 100644
--- a/tests/index/filemodes.c
+++ b/tests/index/filemodes.c
@@ -78,7 +78,7 @@ void test_index_filemodes__untrusted(void)
cl_repo_set_bool(g_repo, "core.filemode", false);
cl_git_pass(git_repository_index(&index, g_repo));
- cl_assert((git_index_caps(index) & GIT_INDEXCAP_NO_FILEMODE) != 0);
+ cl_assert((git_index_caps(index) & GIT_INDEX_CAPABILITY_NO_FILEMODE) != 0);
/* 1 - add 0644 over existing 0644 -> expect 0644 */
replace_file_with_mode("exec_off", "filemodes/exec_off.0", 0644);
@@ -122,7 +122,7 @@ void test_index_filemodes__trusted(void)
cl_repo_set_bool(g_repo, "core.filemode", true);
cl_git_pass(git_repository_index(&index, g_repo));
- cl_assert((git_index_caps(index) & GIT_INDEXCAP_NO_FILEMODE) == 0);
+ cl_assert((git_index_caps(index) & GIT_INDEX_CAPABILITY_NO_FILEMODE) == 0);
/* 1 - add 0644 over existing 0644 -> expect 0644 */
replace_file_with_mode("exec_off", "filemodes/exec_off.0", 0644);
@@ -245,7 +245,7 @@ void test_index_filemodes__invalid(void)
cl_git_pass(git_index_add_bypath(index, "dummy-file.txt"));
cl_assert((dummy = git_index_get_bypath(index, "dummy-file.txt", 0)));
- GIT_IDXENTRY_STAGE_SET(&entry, 0);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, 0);
entry.path = "foo";
entry.mode = GIT_OBJ_BLOB;
git_oid_cpy(&entry.id, &dummy->id);
diff --git a/tests/index/names.c b/tests/index/names.c
index 11d2c416a..e36a66740 100644
--- a/tests/index/names.c
+++ b/tests/index/names.c
@@ -41,21 +41,21 @@ static void index_add_conflicts(void)
/* ancestor */
entry.path = conflict[0];
entry.mode = GIT_FILEMODE_BLOB;
- GIT_IDXENTRY_STAGE_SET(&entry, GIT_INDEX_STAGE_ANCESTOR);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, GIT_INDEX_STAGE_ANCESTOR);
git_oid_fromstr(&entry.id, "1f85ca51b8e0aac893a621b61a9c2661d6aa6d81");
cl_git_pass(git_index_add(repo_index, &entry));
/* ours */
entry.path = conflict[1];
entry.mode = GIT_FILEMODE_BLOB;
- GIT_IDXENTRY_STAGE_SET(&entry, GIT_INDEX_STAGE_OURS);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, GIT_INDEX_STAGE_OURS);
git_oid_fromstr(&entry.id, "1f85ca51b8e0aac893a621b61a9c2661d6aa6d81");
cl_git_pass(git_index_add(repo_index, &entry));
/* theirs */
entry.path = conflict[2];
entry.mode = GIT_FILEMODE_BLOB;
- GIT_IDXENTRY_STAGE_SET(&entry, GIT_INDEX_STAGE_THEIRS);
+ GIT_INDEX_ENTRY_STAGE_SET(&entry, GIT_INDEX_STAGE_THEIRS);
git_oid_fromstr(&entry.id, "1f85ca51b8e0aac893a621b61a9c2661d6aa6d81");
cl_git_pass(git_index_add(repo_index, &entry));
}
diff --git a/tests/index/racy.c b/tests/index/racy.c
index a15f0fc87..e08deaea3 100644
--- a/tests/index/racy.c
+++ b/tests/index/racy.c
@@ -210,13 +210,13 @@ void test_index_racy__adding_to_index_is_uptodate(void)
/* ensure that they're all uptodate */
cl_assert((entry = git_index_get_bypath(index, "A", 0)));
- cl_assert_equal_i(GIT_IDXENTRY_UPTODATE, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(GIT_INDEX_ENTRY_UPTODATE, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(index, "B", 0)));
- cl_assert_equal_i(GIT_IDXENTRY_UPTODATE, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(GIT_INDEX_ENTRY_UPTODATE, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(index, "C", 0)));
- cl_assert_equal_i(GIT_IDXENTRY_UPTODATE, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(GIT_INDEX_ENTRY_UPTODATE, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_git_pass(git_index_write(index));
@@ -237,13 +237,13 @@ void test_index_racy__reading_clears_uptodate_bit(void)
/* ensure that no files are uptodate */
cl_assert((entry = git_index_get_bypath(index, "A", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(index, "B", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(index, "C", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
git_index_free(index);
}
@@ -264,13 +264,13 @@ void test_index_racy__read_tree_clears_uptodate_bit(void)
/* ensure that no files are uptodate */
cl_assert((entry = git_index_get_bypath(index, "A", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(index, "B", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(index, "C", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
git_tree_free(tree);
git_index_free(index);
@@ -311,13 +311,13 @@ void test_index_racy__read_index_clears_uptodate_bit(void)
/* ensure that files brought in from the other index are not uptodate */
cl_assert((entry = git_index_get_bypath(newindex, "A", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(newindex, "B", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
cl_assert((entry = git_index_get_bypath(newindex, "C", 0)));
- cl_assert_equal_i(0, (entry->flags_extended & GIT_IDXENTRY_UPTODATE));
+ cl_assert_equal_i(0, (entry->flags_extended & GIT_INDEX_ENTRY_UPTODATE));
git_index_free(index);
git_index_free(newindex);
diff --git a/tests/index/read_index.c b/tests/index/read_index.c
index 2df7cc8eb..836c12b0e 100644
--- a/tests/index/read_index.c
+++ b/tests/index/read_index.c
@@ -147,17 +147,17 @@ static void add_conflicts(git_index *index, const char *filename)
ancestor_entry.path = filename;
ancestor_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 1);
git_oid_fromstr(&ancestor_entry.id, ancestor_ids[conflict_idx]);
our_entry.path = filename;
our_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&our_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&our_entry, 2);
git_oid_fromstr(&our_entry.id, our_ids[conflict_idx]);
their_entry.path = filename;
their_entry.mode = 0100644;
- GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 2);
+ GIT_INDEX_ENTRY_STAGE_SET(&ancestor_entry, 2);
git_oid_fromstr(&their_entry.id, their_ids[conflict_idx]);
cl_git_pass(git_index_conflict_add(index, &ancestor_entry,
diff --git a/tests/index/reuc.c b/tests/index/reuc.c
index 1489ed13e..73eaf9ef0 100644
--- a/tests/index/reuc.c
+++ b/tests/index/reuc.c
@@ -129,12 +129,12 @@ void test_index_reuc__ignore_case(void)
index_caps = git_index_caps(repo_index);
- index_caps &= ~GIT_INDEXCAP_IGNORE_CASE;
+ index_caps &= ~GIT_INDEX_CAPABILITY_IGNORE_CASE;
cl_git_pass(git_index_set_caps(repo_index, index_caps));
cl_assert(!git_index_reuc_get_bypath(repo_index, "TWO.txt"));
- index_caps |= GIT_INDEXCAP_IGNORE_CASE;
+ index_caps |= GIT_INDEX_CAPABILITY_IGNORE_CASE;
cl_git_pass(git_index_set_caps(repo_index, index_caps));
cl_assert_equal_i(2, git_index_reuc_entrycount(repo_index));
@@ -197,7 +197,7 @@ void test_index_reuc__updates_existing(void)
index_caps = git_index_caps(repo_index);
- index_caps |= GIT_INDEXCAP_IGNORE_CASE;
+ index_caps |= GIT_INDEX_CAPABILITY_IGNORE_CASE;
cl_git_pass(git_index_set_caps(repo_index, index_caps));
git_oid_fromstr(&ancestor_oid, TWO_ANCESTOR_OID);
diff --git a/tests/index/tests.c b/tests/index/tests.c
index de57bd898..49ef8b2cb 100644
--- a/tests/index/tests.c
+++ b/tests/index/tests.c
@@ -810,7 +810,7 @@ void test_index_tests__preserves_case(void)
cl_git_rewritefile("myrepo/TEST.txt", "hello again\n");
cl_git_pass(git_index_add_bypath(index, "TEST.txt"));
- if (index_caps & GIT_INDEXCAP_IGNORE_CASE)
+ if (index_caps & GIT_INDEX_CAPABILITY_IGNORE_CASE)
cl_assert_equal_i(1, (int)git_index_entrycount(index));
else
cl_assert_equal_i(2, (int)git_index_entrycount(index));
@@ -821,7 +821,7 @@ void test_index_tests__preserves_case(void)
cl_assert(git__strcmp(entry->path, "test.txt") == 0);
cl_assert((entry = git_index_get_bypath(index, "TEST.txt", 0)) != NULL);
- if (index_caps & GIT_INDEXCAP_IGNORE_CASE)
+ if (index_caps & GIT_INDEX_CAPABILITY_IGNORE_CASE)
/* The path should *not* have changed without an explicit remove */
cl_assert(git__strcmp(entry->path, "test.txt") == 0);
else
@@ -923,13 +923,13 @@ void test_index_tests__reload_while_ignoring_case(void)
cl_git_pass(git_vector_verify_sorted(&index->entries));
caps = git_index_caps(index);
- cl_git_pass(git_index_set_caps(index, caps &= ~GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps &= ~GIT_INDEX_CAPABILITY_IGNORE_CASE));
cl_git_pass(git_index_read(index, true));
cl_git_pass(git_vector_verify_sorted(&index->entries));
cl_assert(git_index_get_bypath(index, ".HEADER", 0));
cl_assert_equal_p(NULL, git_index_get_bypath(index, ".header", 0));
- cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps | GIT_INDEX_CAPABILITY_IGNORE_CASE));
cl_git_pass(git_index_read(index, true));
cl_git_pass(git_vector_verify_sorted(&index->entries));
cl_assert(git_index_get_bypath(index, ".HEADER", 0));
@@ -948,7 +948,7 @@ void test_index_tests__change_icase_on_instance(void)
cl_git_pass(git_vector_verify_sorted(&index->entries));
caps = git_index_caps(index);
- cl_git_pass(git_index_set_caps(index, caps &= ~GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps &= ~GIT_INDEX_CAPABILITY_IGNORE_CASE));
cl_assert_equal_i(false, index->ignore_case);
cl_git_pass(git_vector_verify_sorted(&index->entries));
cl_assert(e = git_index_get_bypath(index, "src/common.h", 0));
@@ -956,7 +956,7 @@ void test_index_tests__change_icase_on_instance(void)
cl_assert(e = git_index_get_bypath(index, "COPYING", 0));
cl_assert_equal_p(NULL, e = git_index_get_bypath(index, "copying", 0));
- cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE));
+ cl_git_pass(git_index_set_caps(index, caps | GIT_INDEX_CAPABILITY_IGNORE_CASE));
cl_assert_equal_i(true, index->ignore_case);
cl_git_pass(git_vector_verify_sorted(&index->entries));
cl_assert(e = git_index_get_bypath(index, "COPYING", 0));
View Lorry Controller Status