diff options
| author | Yuang Li <yuangli88@hotmail.com> | 2022-07-29 01:32:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 01:32:40 +0100 |
| commit | 09acf6986513381316c8797c4529323bff8525a5 (patch) | |
| tree | 2802cfbafd3e7d94e6a3153848ed0edf3ac1aebc /tests/libgit2/merge/workdir/trivial.c | |
| parent | 3d7a609d632d7a16d099897735f41dae248e943b (diff) | |
| parent | 7f46bfac14f0502711f8441348fd361175953fd5 (diff) | |
| download | libgit2-09acf6986513381316c8797c4529323bff8525a5.tar.gz | |
Merge branch 'mw_dev' into shallow-clone-local
Diffstat (limited to 'tests/libgit2/merge/workdir/trivial.c')
| -rw-r--r-- | tests/libgit2/merge/workdir/trivial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/libgit2/merge/workdir/trivial.c b/tests/libgit2/merge/workdir/trivial.c index fe8374851..364182c89 100644 --- a/tests/libgit2/merge/workdir/trivial.c +++ b/tests/libgit2/merge/workdir/trivial.c @@ -222,7 +222,7 @@ void test_merge_workdir_trivial__13(void) cl_git_pass(merge_trivial("trivial-13", "trivial-13-branch")); cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-13.txt", 0)); - cl_git_pass(git_oid_fromstr(&expected_oid, "1cff9ec6a47a537380dedfdd17c9e76d74259a2b")); + cl_git_pass(git_oid__fromstr(&expected_oid, "1cff9ec6a47a537380dedfdd17c9e76d74259a2b", GIT_OID_SHA1)); cl_assert(git_oid_cmp(&entry->id, &expected_oid) == 0); cl_assert(git_index_reuc_entrycount(repo_index) == 0); @@ -238,7 +238,7 @@ void test_merge_workdir_trivial__14(void) cl_git_pass(merge_trivial("trivial-14", "trivial-14-branch")); cl_assert(entry = git_index_get_bypath(repo_index, "modified-in-14-branch.txt", 0)); - cl_git_pass(git_oid_fromstr(&expected_oid, "26153a3ff3649b6c2bb652d3f06878c6e0a172f9")); + cl_git_pass(git_oid__fromstr(&expected_oid, "26153a3ff3649b6c2bb652d3f06878c6e0a172f9", GIT_OID_SHA1)); cl_assert(git_oid_cmp(&entry->id, &expected_oid) == 0); cl_assert(git_index_reuc_entrycount(repo_index) == 0); |