diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2023-02-23 15:39:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-23 15:39:12 +0000 |
| commit | 6f2eedb7eb58f5af2e96cafeae7261c07c928d89 (patch) | |
| tree | 1a7aa6904bafbc9bde792b9fffc8dfe46738f2a8 | |
| parent | bf7d3888d5827fe36e8ef854a18e36376696f51c (diff) | |
| parent | d16b59c91e524bfa385b3db511da727a66694820 (diff) | |
| download | libgit2-6f2eedb7eb58f5af2e96cafeae7261c07c928d89.tar.gz | |
Merge pull request #6499 from libgit2/ethomson/sha256_fix_2
odb: don't unconditionally add oid_type to stream
| -rw-r--r-- | include/git2/odb_backend.h | 2 | ||||
| -rw-r--r-- | src/libgit2/odb.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/git2/odb_backend.h b/include/git2/odb_backend.h index 4d0559ec0..12dd0fd38 100644 --- 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 index edf4f001f..1a02cbad9 100644 --- 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; |