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/checkout/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/checkout/index.c')
-rw-r--r-- | tests/checkout/index.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/checkout/index.c b/tests/checkout/index.c index 65a121d76..a4c811b6f 100644 --- a/tests/checkout/index.c +++ b/tests/checkout/index.c @@ -733,15 +733,15 @@ static void add_conflict(git_index *index, const char *path) entry.path = path; git_oid_fromstr(&entry.id, "d427e0b2e138501a3d15cc376077a3631e15bd46"); - GIT_IDXENTRY_STAGE_SET(&entry, 1); + GIT_INDEX_ENTRY_STAGE_SET(&entry, 1); cl_git_pass(git_index_add(index, &entry)); git_oid_fromstr(&entry.id, "4e886e602529caa9ab11d71f86634bd1b6e0de10"); - GIT_IDXENTRY_STAGE_SET(&entry, 2); + GIT_INDEX_ENTRY_STAGE_SET(&entry, 2); cl_git_pass(git_index_add(index, &entry)); git_oid_fromstr(&entry.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); - GIT_IDXENTRY_STAGE_SET(&entry, 3); + GIT_INDEX_ENTRY_STAGE_SET(&entry, 3); cl_git_pass(git_index_add(index, &entry)); } |