Merge pull request #6499 from libgit2/ethomson/sha256_fix_2

odb: don't unconditionally add oid_type to stream
libgit2 · Feb 23, 2023 · 6f2eedb · 6f2eedb
2 parents bf7d388 + d16b59c
commit 6f2eedb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/include/git2/odb_backend.h b/include/git2/odb_backend.h
@@ -171,7 +171,9 @@ struct git_odb_stream {
 	unsigned int mode;
 	void *hash_ctx;
 
+#ifdef GIT_EXPERIMENTAL_SHA256
 	git_oid_t oid_type;
+#endif
 
 	git_object_size_t declared_size;
 	git_object_size_t received_bytes;

diff --git a/src/libgit2/odb.c b/src/libgit2/odb.c
@@ -1704,7 +1704,9 @@ int git_odb_open_wstream(
 	    (error = hash_header(ctx, size, type)) < 0)
 		goto done;
 
+#ifdef GIT_EXPERIMENTAL_SHA256
 	(*stream)->oid_type = db->options.oid_type;
+#endif
 	(*stream)->hash_ctx = ctx;
 	(*stream)->declared_size = size;
 	(*stream)->received_bytes = 0;