On Sat, Aug 02, 2025 at 02:28:24PM -0400, Justin Su wrote:
> Turns out this was because I had `transfer.fsckObjects = true` in my
> global config.
>
> I think you should be able to repro if you change the last command to
> `git -c fetch.fsckObjects=true fetch upstream`.
Thanks, I can reproduce easily now. The object in question isn't
mentioned directly in the pack at all, as an incoming object or as a
delta. It's mentioned by a tree, c5b8c11446. And then when we fsck, we
hit it via fsck_walk_tree(). And then when we've finished indexing the
pack, we check for any objects that were mentioned but which we don't
have. And we don't have 0020d54b979, so we barf.
I assume what's happening is that 0020d54b979 is contained in the origin
repo, but we don't fetch (because of the blob:none filter). And then
when we talk to the upstream repo, it assumes we _do_ have it because of
the commits that we claimed to have. And that looks like the case. In
the partial clone we can do:
$ git rev-list --objects --all --missing=print-info | grep 0020d54b
?0020d54b979cc8cf59a13406f98bfe515b190559 path=src/features/navigate.rs type=blob
There it is, mentioned by the origin repo.
So it is perfectly normal for us to be missing this object, and
index-pack is wrong to complain. Curiously, there's this code in
fetch-pack.c:
if (args->from_promisor)
/*
* create_promisor_file() may be called afterwards but
* we still need index-pack to know that this is a
* promisor pack. For example, if transfer.fsckobjects
* is true, index-pack needs to know that .gitmodules
* is a promisor object (so that it won't complain if
* it is missing).
*/
strvec_push(&cmd.args, "--promisor");
which you'd think would kick in here. And I confirmed that the
index-pack which barfs is passed that option.
So I dunno. Clearly there is a bug, but it's not clear to me how this
code is actually supposed to work.
Doing this:
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 0a5c8a1ac8..e01cf7238b 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -262,9 +262,14 @@ static unsigned check_object(struct object *obj)
unsigned long size;
int type = odb_read_object_info(the_repository->objects,
&obj->oid, &size);
- if (type <= 0)
+ if (type <= 0) {
+ if (is_promisor_object(the_repository, &obj->oid)) {
+ obj->flags |= FLAG_CHECKED;
+ return 1;
+ }
die(_("did not receive expected object %s"),
oid_to_hex(&obj->oid));
+ }
if (type != obj->type)
die(_("object %s: expected type %s, found %s"),
oid_to_hex(&obj->oid),
makes the problem go away. But I feel like I'm probably missing
something (and that function is rather expensive to run, though maybe
not so bad if the alternative is crashing).
+cc Jonathan Tan as the author of the code comment above for any wisdom.
-Peff
