]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ew/hash-with-openssl-evp'
authorJunio C Hamano <gitster@pobox.com>
Wed, 13 Sep 2023 17:07:56 +0000 (10:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 13 Sep 2023 17:07:57 +0000 (10:07 -0700)
Fix-up new-ish code to support OpenSSL EVP API.

* ew/hash-with-openssl-evp:
  treewide: fix various bugs w/ OpenSSL 3+ EVP API

1  2 
builtin/fast-import.c
builtin/index-pack.c
builtin/unpack-objects.c
bulk-checkin.c
csum-file.c

Simple merge
Simple merge
index 32505255a0097b84080dd8af37454aeb01ee8001,b16d38af13300eff203a3f57e108b5886dade618..fef7423448804006a04286ce18adedbaaf950229
@@@ -609,8 -608,9 +609,9 @@@ int cmd_unpack_objects(int argc, const 
  {
        int i;
        struct object_id oid;
+       git_hash_ctx tmp_ctx;
  
 -      read_replace_refs = 0;
 +      disable_replace_refs();
  
        git_config(git_default_config, NULL);
  
diff --cc bulk-checkin.c
Simple merge
diff --cc csum-file.c
Simple merge