git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/3] setup: reject compatObjectFormat == objectFormat

From
Patrick Steinhardt <ps@pks.im>
Date
Nov 16, 2026, 07:36 UTC
Message-ID
<avqyiXdZIFoJbw34@pks.im>
In-Reply-To
<20261112195740.2834341-2-adrian.ratiu@collabora.com>
On Thu, Nov 12, 2026 at 09:57:38PM +0200, Adrian Ratiu wrote:
Show 11 quoted lines
> 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.

Show 25 quoted lines
> +			    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
Previous: Adrian RatiuNext: Adrian Ratiu
Message 3 of 10 in “compatObjectFormat: fix a BUG(), wrong id and unknown headers”
  1. 0/3 compatObjectFormat: fix a BUG(), wrong id and unknown headersAdrian Ratiu, Nov 12, 2026
  2. 1/3 setup: reject compatObjectFormat == objectFormatAdrian Ratiu, Nov 12, 2026
  3. Patrick SteinhardtNov 16, 2026
  4. Adrian RatiuNov 17, 2026
  5. 2/3 rev-parse: die when --output-object-format cannot map an objectAdrian Ratiu, Nov 12, 2026
  6. Patrick SteinhardtNov 16, 2026
  7. Adrian RatiuNov 17, 2026
  8. 3/3 object-file-convert: copy unknown commit headers unchangedAdrian Ratiu, Nov 12, 2026
  9. Patrick SteinhardtNov 16, 2026
  10. Adrian RatiuNov 17, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.