Re: [PATCH 2/3] rev-parse: die when --output-object-format cannot map an object
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Nov 16, 2026, 07:37 UTC
- Message-ID
- <avqynlDKnJpJn6RZ@pks.im>
- In-Reply-To
- <20261112195740.2834341-3-adrian.ratiu@collabora.com>
On Thu, Nov 12, 2026 at 09:57:39PM +0200, Adrian Ratiu wrote:
Show 7 quoted lines
> "git rev-parse --output-object-format=<compat-format>" should print > an object compat id when extensions.compatObjectFormat is enabled. > > Git however doesn't record a compat id for every object, e.g. for > objects received by a fetch that goes through index-pack. > For such objects, rev-parse silently prints the wrong id: it prints > the storage id where the compat id is expected and exits with 0.
Yeah, that's just plain wrong and extremely confusing.
Show 11 quoted lines
> This happens because rev-parse ignores the repo_oid_to_algop() return > value. When no mapping is found, that function fails and leaves the > id unchanged, so the storage id is what gets printed. > > Fix it to die with the same message as pack-objects. The other callers > of repo_oid_to_algop() already check its result. > > This only covers a single revision argument, the one case where > rev-parse converts its output. Other forms, such as "A..B" or "A^@", > print storage ids whatever --output-object-format says. That is left > for a separate change.
This paragraph is a bit hard to parse.
Note that this only covers the case where the user asks for a single revision, as it is the only case where we pass the desired output hash explicitly. All the other cases, like for example when the user passes a range, do not use the desired output hash at all. Fixing that would be a bigger change though, so this is left for a future patch series.
> The test copies a loose object into the repository by hand, so it > doesn't depend on whether fetch writes compat mappings.
Do we have to do that? I'm mostly asking in the context of the new object storage format extension, which may change where and how exactly objects are stored. So all tests that manually modify the object database will break, and we'll want and need to fix those.
Show 16 quoted lines
> diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
> index d2154eac8d..ab2898ba52 100644
> --- a/builtin/rev-parse.c
> +++ b/builtin/rev-parse.c
> @@ -1171,9 +1171,11 @@ int cmd_rev_parse(int argc,
> }
> if (!repo_get_oid_with_flags(the_repository, name, &oid,
> flags)) {
> - if (output_algo)
> - repo_oid_to_algop(the_repository, &oid,
> - output_algo, &oid);
> + if (output_algo &&
> + repo_oid_to_algop(the_repository, &oid,
> + output_algo, &oid))
> + die(_("cannot map object %s to %s"),
> + oid_to_hex(&oid), output_algo->name);Makes sense. I would have checked for `< 0`, but that ultimately doesn't matter much.
Show 15 quoted lines
> diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh > index 30bf8a4d0a..c15d9953a8 100755 > --- a/t/t1500-rev-parse.sh > +++ b/t/t1500-rev-parse.sh > @@ -241,6 +241,24 @@ test_expect_success RUST 'rev-parse --show-object-format in repo with compat mod > ) > ' > > +test_expect_success RUST 'rev-parse --output-object-format with unmapped object' ' > + test_when_finished "rm -rf plain compat" && > + git init --object-format=sha256 plain && > + git init --object-format=sha256 compat && > + git -C compat config extensions.compatobjectformat sha1 && > + oid=$(echo unmapped | git -C plain hash-object -w --stdin) && > + # copy the object by hand, so that no compat mapping is written for it
Instead of copying by hand, wouldn't it be possible to write the object with the compat object format unset and then set it afterwards? That should also ensure that we don't have the compat hash.
Patrick