diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2023-04-22 23:12:00 +0100 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2023-04-22 23:17:32 +0100 |
| commit | 190a4c55df72b32adf4d60f77cbc47276b74f84b (patch) | |
| tree | 896d6d41c2ea6305992bd646bbbe79a3fdb5f6fe /tests/libgit2/checkout/index.c | |
| parent | e288f874a3a73ef31f88bb524f6d25d5ff3c5a3a (diff) | |
| parent | 8a62616f43fe5ea37d41296f40293ff97aa88cfa (diff) | |
| download | libgit2-190a4c55df72b32adf4d60f77cbc47276b74f84b.tar.gz | |
Merge remote-tracking branch 'origin/main' into shallow-clone-network
Diffstat (limited to 'tests/libgit2/checkout/index.c')
| -rw-r--r-- | tests/libgit2/checkout/index.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/libgit2/checkout/index.c b/tests/libgit2/checkout/index.c index 6432cba84..3dfdaa630 100644 --- a/tests/libgit2/checkout/index.c +++ b/tests/libgit2/checkout/index.c @@ -4,6 +4,7 @@ #include "git2/checkout.h" #include "futils.h" #include "repository.h" +#include "index.h" #include "remote.h" #include "repo/repo_helpers.h" @@ -834,7 +835,7 @@ void test_checkout_index__adding_conflict_removes_stage_0(void) git_index *new_index, *index; git_checkout_options opts = GIT_CHECKOUT_OPTIONS_INIT; - cl_git_pass(git_index_new(&new_index)); + cl_git_pass(git_index__new(&new_index, GIT_OID_SHA1)); add_conflict(new_index, "new.txt"); cl_git_pass(git_checkout_index(g_repo, new_index, &opts)); |