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

Re: [PATCH v2 2/8] pack-objects: ensure tree/tag closure with '--stdin-packs=follow'

From
Jeff King <peff@peff.net>
Date
Oct 2, 2026, 23:13 UTC
Message-ID
<20261002231336.GB834759@coredump.intra.peff.net>
In-Reply-To
<940953e5c407046ac6789367f3341dc8ea73d07a.1790827875.git.me@ttaylorr.com>
On Wed, Sep 30, 2026 at 11:11:39PM -0500, Taylor Blau wrote:
Show 15 quoted lines
> @@ -4151,6 +4158,34 @@ static void read_stdin_packs(struct repository *repo,
>  			     show_object_pack_hint,
>  			     &mode);
>  
> +	/*
> +	 * Trees and tags need closure even when no commit reaches them.
> +	 * Defer adding these roots to revs.pending until the first walk
> +	 * finishes. Otherwise a subtree may be visited and marked SEEN
> +	 * before its commit's root tree, using "a" instead of "sub/a"
> +	 * for a blob's namehash and delta attributes.
> +	 *
> +	 * Tags may introduce more commits in the second walk, so this
> +	 * does not *always* guarantee that trees are always visited
> +	 * with their full paths.
> +	 */

I think one of the things that confused me reading the original patch (but is still present here) is that this comment is in read_stdin_packs, when we're actually doing the walks. So "defer adding these roots" feels quite late. We already did that deferring long before in add_object_entry_from_pack() and add_loose_object(), when we called oidset_insert() instead of add_pending().

So it would have made more sense to me to comment it there. Of course that is hard when there are two such places.

I dunno.
Show 18 quoted lines
> +	oidset_iter_init(&ctx.extra_roots, &iter);
> +	while ((oid = oidset_iter_next(&iter))) {
> +		struct object *obj = lookup_object(repo, oid);
> +
> +		if (!obj || !(obj->flags & SEEN))
> +			add_pending_oid(&revs, NULL, oid, 0);
> +	}
> +	if (revs.pending.nr) {
> +		if (prepare_revision_walk(&revs))
> +			die(_("revision walk setup failed"));
> +		traverse_commit_list(&revs,
> +				     show_commit_pack_hint,
> +				     show_object_pack_hint,
> +				     &mode);
> +	}
> +	oidset_clear(&ctx.extra_roots);
> +
>  	release_revisions(&revs);

BTW, is it safe to prepare_revision_walk() twice on the same rev_info? I could believe it works, but I could also believe that there are hidden corner cases, as I don't think it was ever really intended to work this way.

Maybe OK for the vanilla set of options we are using here (as opposed to taking arbitrary options from the user). The rev_info is created locally in this function, though, so I guess if we wanted to be double-plus sure we could release and reinit the struct.

-Peff
Previous: Taylor BlauNext: Taylor Blau
Message 25 of 41 in “repack: various corner cases for cruft-less MIDXs”
  1. 0/4 repack: various corner cases for cruft-less MIDXsTaylor Blau, Sep 30, 2026
  2. 1/4 pack-objects: introduce `stdin_packs_context` structTaylor Blau, Sep 30, 2026
  3. Junio C HamanoSep 30, 2026
  4. Taylor BlauOct 1, 2026
  5. 2/4 pack-objects: ensure tree/tag closure with '--stdin-packs=follow'Taylor Blau, Sep 30, 2026
  6. Junio C HamanoSep 30, 2026
  7. Derrick StoleeSep 30, 2026
  8. Taylor BlauOct 1, 2026
  9. Elijah NewrenOct 1, 2026
  10. Taylor BlauOct 2, 2026
  11. Jeff KingOct 2, 2026
  12. Jeff KingSep 30, 2026
  13. Taylor BlauOct 1, 2026
  14. 3/4 repack: retain cruft packs in MIDXs after incremental repacksTaylor Blau, Sep 30, 2026
  15. Jeff KingSep 30, 2026
  16. Taylor BlauOct 1, 2026
  17. 4/4 repack: retain cruft packs in MIDXs containing kept packsTaylor Blau, Sep 30, 2026
  18. Jeff KingSep 30, 2026
  19. Taylor BlauOct 1, 2026
  20. Jeff KingSep 30, 2026
  21. Taylor BlauOct 1, 2026
  22. 0/8 repack: various corner cases for cruft-less MIDXsTaylor Blau, Oct 1, 2026
  23. 1/8 pack-objects: introduce `stdin_packs_context` structTaylor Blau, Oct 1, 2026
  24. 2/8 pack-objects: ensure tree/tag closure with '--stdin-packs=follow'Taylor Blau, Oct 1, 2026
  25. Jeff KingOct 2, 2026
  26. Taylor BlauOct 3, 2026
  27. Jeff KingOct 3, 2026
  28. 3/8 repack: retain cruft packs in MIDXs after incremental repacksTaylor Blau, Oct 1, 2026
  29. 4/8 repack: use a sorted list for explicitly kept packsTaylor Blau, Oct 1, 2026
  30. Jeff KingOct 2, 2026
  31. 5/8 repack: follow kept packs when omitting cruft from the MIDXTaylor Blau, Oct 1, 2026
  32. Jeff KingOct 2, 2026
  33. Taylor BlauOct 3, 2026
  34. 6/8 repack: track the preferred pack explicitly in MIDX write stepsTaylor Blau, Oct 1, 2026
  35. Jeff KingOct 2, 2026
  36. Taylor BlauOct 3, 2026
  37. Jeff KingOct 3, 2026
  38. 7/8 repack: defer allocating the append plan's write stepTaylor Blau, Oct 1, 2026
  39. 8/8 repack: include required packs in incremental MIDX writesTaylor Blau, Oct 1, 2026
  40. Jeff KingOct 2, 2026
  41. Taylor BlauOct 3, 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.