diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-08 14:28:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 14:28:17 -0700 |
| commit | 0dfca9888191bcea4fa00fb3c7abda787e06cf75 (patch) | |
| tree | b1aaec26bf06b5679e256e298ba389aaf0ca1b00 /submodule-config.c | |
| parent | 9d22ac51228304102deb62f30c3ecba6377e1237 (diff) | |
| parent | 7d70b29c4f0b2fd3c6698956d9fb4026632d9c6e (diff) | |
| download | git-0dfca9888191bcea4fa00fb3c7abda787e06cf75.tar.xz | |
Merge branch 'ps/object-wo-the-repository' into ps/object-file-cleanup
* 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 'submodule-config.c')
| -rw-r--r-- | submodule-config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule-config.c b/submodule-config.c index a25059ed7f..d82b404b73 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -831,7 +831,7 @@ static int gitmodules_cb(const char *var, const char *value, parameter.cache = repo->submodule_cache; parameter.treeish_name = NULL; - parameter.gitmodules_oid = null_oid(); + parameter.gitmodules_oid = null_oid(the_hash_algo); parameter.overwrite = 1; return parse_config(var, value, ctx, ¶meter); |