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/object | |
| parent | 191e97a02b3360820177ed7642116796551ce1f6 (diff) | |
| download | libgit2-2f1080ea04ad1235efcd4b213dbe3a1b847644f7.tar.gz | |
conflict tests: use GIT_IDXENTRY_STAGE_SET
Diffstat (limited to 'tests/object')
| -rw-r--r-- | tests/object/tree/duplicateentries.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/object/tree/duplicateentries.c b/tests/object/tree/duplicateentries.c index 65be12e9b..35dd383ec 100644 --- a/tests/object/tree/duplicateentries.c +++ b/tests/object/tree/duplicateentries.c @@ -126,17 +126,17 @@ static void add_fake_conflicts(git_index *index) ancestor_entry.path = "duplicate"; ancestor_entry.mode = GIT_FILEMODE_BLOB; - ancestor_entry.flags |= (1 << GIT_IDXENTRY_STAGESHIFT); + GIT_IDXENTRY_STAGE_SET(&ancestor_entry, 1); git_oid_fromstr(&ancestor_entry.id, "a8233120f6ad708f843d861ce2b7228ec4e3dec6"); our_entry.path = "duplicate"; our_entry.mode = GIT_FILEMODE_BLOB; - ancestor_entry.flags |= (2 << GIT_IDXENTRY_STAGESHIFT); + GIT_IDXENTRY_STAGE_SET(&our_entry, 2); git_oid_fromstr(&our_entry.id, "45b983be36b73c0788dc9cbcb76cbb80fc7bb057"); their_entry.path = "duplicate"; their_entry.mode = GIT_FILEMODE_BLOB; - ancestor_entry.flags |= (3 << GIT_IDXENTRY_STAGESHIFT); + GIT_IDXENTRY_STAGE_SET(&their_entry, 3); git_oid_fromstr(&their_entry.id, "a71586c1dfe8a71c6cbf6c129f404c5642ff31bd"); cl_git_pass(git_index_conflict_add(index, &ancestor_entry, &our_entry, &their_entry)); |