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/reset | |
| parent | 191e97a02b3360820177ed7642116796551ce1f6 (diff) | |
| download | libgit2-2f1080ea04ad1235efcd4b213dbe3a1b847644f7.tar.gz | |
conflict tests: use GIT_IDXENTRY_STAGE_SET
Diffstat (limited to 'tests/reset')
| -rw-r--r-- | tests/reset/hard.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/reset/hard.c b/tests/reset/hard.c index 86d4be2ed..88055adda 100644 --- a/tests/reset/hard.c +++ b/tests/reset/hard.c @@ -108,7 +108,7 @@ static void index_entry_init(git_index *index, int side, git_oid *oid) memset(&entry, 0x0, sizeof(git_index_entry)); entry.path = "conflicting_file"; - entry.flags = (side << GIT_IDXENTRY_STAGESHIFT); + GIT_IDXENTRY_STAGE_SET(&entry, side); entry.mode = 0100644; git_oid_cpy(&entry.id, oid); |