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/conflict.c | |
| parent | 191e97a02b3360820177ed7642116796551ce1f6 (diff) | |
| download | libgit2-2f1080ea04ad1235efcd4b213dbe3a1b847644f7.tar.gz | |
conflict tests: use GIT_IDXENTRY_STAGE_SET
Diffstat (limited to 'tests/checkout/conflict.c')
| -rw-r--r-- | tests/checkout/conflict.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c index 3d763af12..006dc6522 100644 --- a/tests/checkout/conflict.c +++ b/tests/checkout/conflict.c @@ -102,7 +102,7 @@ static void create_index(struct checkout_index_entry *entries, size_t entries_le memset(&entry, 0x0, sizeof(git_index_entry)); entry.mode = entries[i].mode; - entry.flags = entries[i].stage << GIT_IDXENTRY_STAGESHIFT; + GIT_IDXENTRY_STAGE_SET(&entry, entries[i].stage); git_oid_fromstr(&entry.id, entries[i].oid_str); entry.path = entries[i].path; |