From: Patrick Steinhardt Date: Mon, 16 Nov 2026 07:36:53 GMT Subject: Re: [PATCH 1/3] setup: reject compatObjectFormat == objectFormat Message-ID: In-Reply-To: <20261112195740.2834341-2-adrian.ratiu@collabora.com> On Thu, Nov 12, 2026 at 09:57:38PM +0200, Adrian Ratiu wrote: > diff --git a/setup.c b/setup.c > index 186815c780..52a9462edd 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", We should rather say "extensions.compatObjectFormat" here with proper casing, as this is user-facing. > + 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..858aea62a5 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 core.repositoryformatversion 1 && > + git -C same config 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 --file=same/.git/config --unset extensions.compatObjectFormat && Nit: do we maybe want to use the modern alternate `git config unset`? If so, we should probably be consistent and also use `gi tconfig set` further up. Patrick