diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-05-19 11:17:07 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-05-28 09:44:22 -0400 |
| commit | 2f1080ea04ad1235efcd4b213dbe3a1b847644f7 (patch) | |
| tree | 1a7a8a74633de14577af757012bd8738d89c3369 /tests/checkout/index.c | |
| parent | 191e97a02b3360820177ed7642116796551ce1f6 (diff) | |
| download | libgit2-2f1080ea04ad1235efcd4b213dbe3a1b847644f7.tar.gz | |
conflict tests: use GIT_IDXENTRY_STAGE_SET
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 de0770dba..89b014586 100644 --- a/tests/checkout/index.c +++ b/tests/checkout/index.c @@ -685,15 +685,15 @@ static void add_conflict(git_index *index, const char *path) entry.path = path; git_oid_fromstr(&entry.id, "d427e0b2e138501a3d15cc376077a3631e15bd46"); - entry.flags = (1 << GIT_IDXENTRY_STAGESHIFT); + GIT_IDXENTRY_STAGE_SET(&entry, 1); cl_git_pass(git_index_add(index, &entry)); git_oid_fromstr(&entry.id, "4e886e602529caa9ab11d71f86634bd1b6e0de10"); - entry.flags = (2 << GIT_IDXENTRY_STAGESHIFT); + GIT_IDXENTRY_STAGE_SET(&entry, 2); cl_git_pass(git_index_add(index, &entry)); git_oid_fromstr(&entry.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); - entry.flags = (3 << GIT_IDXENTRY_STAGESHIFT); + GIT_IDXENTRY_STAGE_SET(&entry, 3); cl_git_pass(git_index_add(index, &entry)); } |