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 /builtin/rebase.c | |
| parent | 9d22ac51228304102deb62f30c3ecba6377e1237 (diff) | |
| parent | 7d70b29c4f0b2fd3c6698956d9fb4026632d9c6e (diff) | |
| download | git-0dfca9888191bcea4fa00fb3c7abda787e06cf75.tar.gz | |
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 'builtin/rebase.c')
| -rw-r--r-- | builtin/rebase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index d4715ed35d..1cd802dd92 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -925,7 +925,7 @@ static void fill_branch_base(struct rebase_options *options, options->orig_head, &merge_bases) < 0) exit(128); if (!merge_bases || merge_bases->next) - oidcpy(branch_base, null_oid()); + oidcpy(branch_base, null_oid(the_hash_algo)); else oidcpy(branch_base, &merge_bases->item->object.oid); |