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/merge.c | |
| parent | f7fd9ce947fc2189ce80abc31fdc6077df94f73b (diff) | |
| download | libgit2-ethomson/sha256_index.tar.gz | |
index: add sha256 supportethomson/sha256_index
Diffstat (limited to 'src/libgit2/merge.c')
| -rw-r--r-- | src/libgit2/merge.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/libgit2/merge.c b/src/libgit2/merge.c index df2cefb29..9a52b9f78 100644 --- a/src/libgit2/merge.c +++ b/src/libgit2/merge.c @@ -1997,8 +1997,11 @@ static int index_update_reuc(git_index *index, git_merge_diff_list *diff_list) return 0; } -static int index_from_diff_list(git_index **out, - git_merge_diff_list *diff_list, bool skip_reuc) +static int index_from_diff_list( + git_index **out, + git_merge_diff_list *diff_list, + git_oid_t oid_type, + bool skip_reuc) { git_index *index; size_t i; @@ -2007,7 +2010,7 @@ static int index_from_diff_list(git_index **out, *out = NULL; - if ((error = git_index_new(&index)) < 0) + if ((error = git_index__new(&index, oid_type)) < 0) return error; if ((error = git_index__fill(index, &diff_list->staged)) < 0) @@ -2157,7 +2160,7 @@ int git_merge__iterators( } } - error = index_from_diff_list(out, diff_list, + error = index_from_diff_list(out, diff_list, repo->oid_type, (opts.flags & GIT_MERGE_SKIP_REUC)); done: @@ -2200,8 +2203,8 @@ int git_merge_trees( result = our_tree; if (result) { - if ((error = git_index_new(out)) == 0) - error = git_index_read_tree(*out, result); + if ((error = git_index__new(out, repo->oid_type)) == 0) + error = git_index_read_tree(*out, result); return error; } |