From: Adrian Ratiu Date: Thu, 19 Nov 2026 14:18:20 GMT Subject: [PATCH v2 1/3] setup: reject compatObjectFormat == objectFormat Message-ID: In-Reply-To: When extensions.compatObjectFormat sets the same hash as the repo object format, every command in a build with Rust aborts with: BUG: repository.c:204: hash_algo and compat_hash_algo match This includes "git config", so the bad value can't be removed with Git. It also happens with no extensions.objectFormat at all, when compatObjectFormat is set to the default object format. Check for this in verify_repository_format(), next to the other repo format checks, and return an error instead. The check runs before any of the Rust-only code. Builds without Rust, which so far died because compatObjectFormat requires Rust, now get the same error, so the test needs no RUST prereq. Signed-off-by: Adrian Ratiu --- setup.c | 7 +++++++ t/t1302-repo-version.sh | 14 ++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/setup.c b/setup.c index 186815c780..a97280cafe 100644 --- a/setup.c +++ b/setup.c @@ -918,6 +918,13 @@ int verify_repository_format(const struct repository_format *format, return -1; } + if (format->compat_hash_algo == format->hash_algo) { + strbuf_addf(err, _("'%s' is '%s', the same as the object format"), + "extensions.compatObjectFormat", + hash_algos[format->hash_algo].name); + return -1; + } + return 0; } diff --git a/t/t1302-repo-version.sh b/t/t1302-repo-version.sh index 69723b88ff..718dafc95c 100755 --- a/t/t1302-repo-version.sh +++ b/t/t1302-repo-version.sh @@ -98,6 +98,20 @@ abort 0 noop-v1 allow 1 noop-v1 EOF +for hash in sha1 sha256 +do + test_expect_success "compatObjectFormat equal to objectFormat $hash" " + test_when_finished 'rm -rf same' && + git init --object-format=$hash same && + git -C same config set core.repositoryformatversion 1 && + git -C same config set extensions.compatObjectFormat $hash && + test_must_fail git -C same rev-parse --git-dir 2>err && + test_grep \"'extensions.compatObjectFormat' is '$hash', the same as the object format\" err && + git config unset --file=same/.git/config extensions.compatObjectFormat && + git -C same rev-parse --git-dir + " +done + test_expect_success 'precious-objects allowed' ' git config core.repositoryFormatVersion 1 && git config extensions.preciousObjects 1 && -- 2.56.1