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/names.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/names.c')
| -rw-r--r-- | tests/index/names.c | 6 |
1 files changed, 3 insertions, 3 deletions
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)); } |