diff options
| author | Vicent Marti <vicent@github.com> | 2014-01-27 09:39:36 -0800 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-01-27 09:39:36 -0800 |
| commit | 93954245e081ff803028431c5da2c8a073512643 (patch) | |
| tree | cb9a16891871bead0af7188f7400c8e7ae4c8692 /tests/checkout/tree.c | |
| parent | 46e7fc1853bb92a2deae93543477f1c1255352d0 (diff) | |
| parent | a1bbc0ce205b6d3496338d3253c847aa91cabc7b (diff) | |
| download | libgit2-93954245e081ff803028431c5da2c8a073512643.tar.gz | |
Merge pull request #2075 from libgit2/cmn/leftover-oid
Leftover OID -> ID changes
Diffstat (limited to 'tests/checkout/tree.c')
| -rw-r--r-- | tests/checkout/tree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/checkout/tree.c b/tests/checkout/tree.c index 047c9ed98..3c731c5ae 100644 --- a/tests/checkout/tree.c +++ b/tests/checkout/tree.c @@ -892,16 +892,16 @@ static void create_conflict(void) memset(&entry, 0x0, sizeof(git_index_entry)); entry.mode = 0100644; entry.flags = 1 << GIT_IDXENTRY_STAGESHIFT; - git_oid_fromstr(&entry.oid, "d427e0b2e138501a3d15cc376077a3631e15bd46"); + git_oid_fromstr(&entry.id, "d427e0b2e138501a3d15cc376077a3631e15bd46"); entry.path = "conflicts.txt"; cl_git_pass(git_index_add(index, &entry)); entry.flags = 2 << GIT_IDXENTRY_STAGESHIFT; - git_oid_fromstr(&entry.oid, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); + git_oid_fromstr(&entry.id, "ee3fa1b8c00aff7fe02065fdb50864bb0d932ccf"); cl_git_pass(git_index_add(index, &entry)); entry.flags = 3 << GIT_IDXENTRY_STAGESHIFT; - git_oid_fromstr(&entry.oid, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); + git_oid_fromstr(&entry.id, "2bd0a343aeef7a2cf0d158478966a6e587ff3863"); cl_git_pass(git_index_add(index, &entry)); git_index_write(index); |