From e1cd4f65951ff2d58383d7129111bb7272c31352 Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Sat, 3 Jan 2026 10:09:28 -0500 Subject: [PATCH] fix(sha256): pass correct oid type These are SHA256 TODO leftover. In the surrounding context they all have the required oid type around, so I just picked up them and pass in. Found during SHA256 support integration with Rust git-rs binding --- src/libgit2/commit_graph.c | 3 +-- src/libgit2/midx.c | 3 +-- src/libgit2/pack-objects.c | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/libgit2/commit_graph.c b/src/libgit2/commit_graph.c index f62b873cc..a841985da 100644 --- a/src/libgit2/commit_graph.c +++ b/src/libgit2/commit_graph.c @@ -817,8 +817,7 @@ int git_commit_graph_writer_add_index_file( if (error < 0) goto cleanup; - /* TODO: SHA256 */ - error = git_mwindow_get_pack(&p, idx_path, 0); + error = git_mwindow_get_pack(&p, idx_path, repo->oid_type); if (error < 0) goto cleanup; diff --git a/src/libgit2/midx.c b/src/libgit2/midx.c index a3f84984c..01152c732 100644 --- a/src/libgit2/midx.c +++ b/src/libgit2/midx.c @@ -579,8 +579,7 @@ int git_midx_writer_add( if (error < 0) return error; - /* TODO: SHA256 */ - error = git_mwindow_get_pack(&p, git_str_cstr(&idx_path_buf), 0); + error = git_mwindow_get_pack(&p, git_str_cstr(&idx_path_buf), w->oid_type); git_str_dispose(&idx_path_buf); if (error < 0) return error; diff --git a/src/libgit2/pack-objects.c b/src/libgit2/pack-objects.c index efdd68aea..072d2902d 100644 --- a/src/libgit2/pack-objects.c +++ b/src/libgit2/pack-objects.c @@ -1437,12 +1437,10 @@ int git_packbuilder_write( opts.progress_cb = progress_cb; opts.progress_cb_payload = progress_cb_payload; - /* TODO: SHA256 */ - #ifdef GIT_EXPERIMENTAL_SHA256 opts.mode = mode; opts.odb = pb->odb; - opts.oid_type = GIT_OID_SHA1; + opts.oid_type = pb->oid_type; error = git_indexer_new(&indexer, path, &opts); #else