diff options
author | Junio C Hamano <gitster@pobox.com> | 2025-04-15 13:50:14 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2025-04-15 13:50:15 -0700 |
commit | ee847e0034dbfde11f901fbfb74d210c1edad496 (patch) | |
tree | 3baa54bf940d7f0506b9160127fcc2b88ad4764b /commit.c | |
parent | f3f00d93a10ac3f000c56e73d646e34fe7b456d1 (diff) | |
parent | 7d70b29c4f0b2fd3c6698956d9fb4026632d9c6e (diff) |
Merge branch 'ps/object-wo-the-repository'
The object layer has been updated to take an explicit repository
instance as a parameter in more code paths.
* ps/object-wo-the-repository:
hash: stop depending on `the_repository` in `null_oid()`
hash: fix "-Wsign-compare" warnings
object-file: split out logic regarding hash algorithms
delta-islands: stop depending on `the_repository`
object-file-convert: stop depending on `the_repository`
pack-bitmap-write: stop depending on `the_repository`
pack-revindex: stop depending on `the_repository`
pack-check: stop depending on `the_repository`
environment: move access to "core.bigFileThreshold" into repo settings
pack-write: stop depending on `the_repository` and `the_hash_algo`
object: stop depending on `the_repository`
csum-file: stop depending on `the_repository`
Diffstat (limited to 'commit.c')
-rw-r--r-- | commit.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1378,7 +1378,7 @@ static int convert_commit_extra_headers(const struct commit_extra_header *orig, struct commit_extra_header *new; CALLOC_ARRAY(new, 1); if (!strcmp(orig->key, "mergetag")) { - if (convert_object_file(&out, algo, compat, + if (convert_object_file(the_repository, &out, algo, compat, orig->value, orig->len, OBJ_TAG, 1)) { free(new); |