diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2018-11-28 13:31:06 +0000 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2018-12-01 10:46:44 +0000 |
| commit | 18e71e6d597abe6c7feb666429c921bd19dc0ba8 (patch) | |
| tree | 623f04b779ae57c2783b13d8c73d8bd215772721 /tests/index/read_index.c | |
| parent | 19faf7c5fcd24fab789d9b7a619b343c1fae7c86 (diff) | |
| download | libgit2-18e71e6d597abe6c7feb666429c921bd19dc0ba8.tar.gz | |
index: use new enum and structure names
Use the new-style index names throughout our own codebase.
Diffstat (limited to 'tests/index/read_index.c')
| -rw-r--r-- | tests/index/read_index.c | 6 |
1 files changed, 3 insertions, 3 deletions
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, |