diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2023-04-05 10:39:01 +0100 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2023-04-05 10:39:01 +0100 |
commit | 751887211b9f9fde4eff15018d2b524da55274d2 (patch) | |
tree | c59f9815cd971168a9bc2c90ef9a2066ebdd8d43 /src/libgit2/apply.c | |
parent | f7fd9ce947fc2189ce80abc31fdc6077df94f73b (diff) | |
download | libgit2-ethomson/sha256_index.tar.gz |
index: add sha256 supportethomson/sha256_index
Diffstat (limited to 'src/libgit2/apply.c')
-rw-r--r-- | src/libgit2/apply.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libgit2/apply.c b/src/libgit2/apply.c index 18304da4d..6b55b812f 100644 --- a/src/libgit2/apply.c +++ b/src/libgit2/apply.c @@ -19,6 +19,7 @@ #include "zstream.h" #include "reader.h" #include "index.h" +#include "repository.h" #include "apply.h" typedef struct { @@ -644,7 +645,7 @@ int git_apply_to_tree( * put the current tree into the postimage as-is - the diff will * replace any entries contained therein */ - if ((error = git_index_new(&postimage)) < 0 || + if ((error = git_index__new(&postimage, repo->oid_type)) < 0 || (error = git_index_read_tree(postimage, preimage)) < 0 || (error = git_reader_for_index(&post_reader, repo, postimage)) < 0) goto done; @@ -851,8 +852,8 @@ int git_apply( * having the full repo index, so we will limit our checkout * to only write these files that were affected by the diff. */ - if ((error = git_index_new(&preimage)) < 0 || - (error = git_index_new(&postimage)) < 0 || + if ((error = git_index__new(&preimage, repo->oid_type)) < 0 || + (error = git_index__new(&postimage, repo->oid_type)) < 0 || (error = git_reader_for_index(&post_reader, repo, postimage)) < 0) goto done; |