Git development
 help / color / mirror / Atom feed
From: Patrick Steinhardt <ps@pks.im>
To: Adrian Ratiu <adrian.ratiu@collabora.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
	"brian m . carlson" <sandals@crustytoothpaste.net>,
	"Eric W . Biederman" <ebiederm@xmission.com>,
	Axel Rasmussen <axelrasmussen@google.com>,
	Emily Shaffer <emilyshaffer@google.com>,
	Josh Steadmon <steadmon@google.com>
Subject: Re: [PATCH 1/3] setup: reject compatObjectFormat == objectFormat
Date: Mon, 16 Nov 2026 08:36:53 +0100	[thread overview]
Message-ID: <avqyiXdZIFoJbw34@pks.im> (raw)
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

  reply	other threads:[~2026-11-16  7:37 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-12 19:57 [PATCH 0/3] compatObjectFormat: fix a BUG(), wrong id and unknown headers Adrian Ratiu
2026-11-12 19:57 ` [PATCH 1/3] setup: reject compatObjectFormat == objectFormat Adrian Ratiu
2026-11-16  7:36   ` Patrick Steinhardt [this message]
2026-11-17 10:42     ` Adrian Ratiu
2026-11-12 19:57 ` [PATCH 2/3] rev-parse: die when --output-object-format cannot map an object Adrian Ratiu
2026-11-16  7:37   ` Patrick Steinhardt
2026-11-17 11:55     ` Adrian Ratiu
2026-11-12 19:57 ` [PATCH 3/3] object-file-convert: copy unknown commit headers unchanged Adrian Ratiu
2026-11-16  7:37   ` Patrick Steinhardt
2026-11-17 15:27     ` Adrian Ratiu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=avqyiXdZIFoJbw34@pks.im \
    --to=ps@pks.im \
    --cc=adrian.ratiu@collabora.com \
    --cc=axelrasmussen@google.com \
    --cc=ebiederm@xmission.com \
    --cc=emilyshaffer@google.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=sandals@crustytoothpaste.net \
    --cc=steadmon@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox