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

Re: [PATCH 7/8] pseudo-merge.c: do not generate empty pseudo-merge commits

From
Jeff King <peff@peff.net>
Date
Aug 17, 2024, 10:38 UTC
Message-ID
<20240817103822.GC551779@coredump.intra.peff.net>
In-Reply-To
<c7e0ee0712034f654f018361f52c09b1043a8441.1723743050.git.me@ttaylorr.com>
On Thu, Aug 15, 2024 at 01:31:17PM -0400, Taylor Blau wrote:
Show 6 quoted lines
> The previous commit demonstrated it is possible to generate empty
> pseudo-merge commits, which is not useful as such pseudo-merges carry no
> information.
> 
> Ensure that we only generate non-empty groups by not pushing a new
> commit onto the bitmap_writer when that commit has no parents.
Makes sense, and the patch seems pretty straight-forward.

It's a little tempting to suggest that we keep some way of writing these, so that we can exercise the reading side in the tests (we _shouldn't_ see these if we're not writing them, but as an on-disk format, we may see examples from other sources). But it is probably not worth the complexity. If we really want to test them, we can probably generate a single example by hand (and we can probably even wait on that until we see something in the wild that makes it worth doing).

-Peff
Previous: Taylor BlauNext: Taylor Blau
Message 15 of 20 in “pseudo-merge: avoid empty and non-closed pseudo-merge commits”
  1. 0/8 pseudo-merge: avoid empty and non-closed pseudo-merge commitsTaylor Blau, Aug 15, 2024
  2. 1/8 pack-bitmap: initialize `bitmap_writer_init()` with packing_dataTaylor Blau, Aug 15, 2024
  3. Jeff KingAug 17, 2024
  4. Taylor BlauAug 29, 2024
  5. Jeff KingAug 29, 2024
  6. 2/8 pack-bitmap: drop redundant args from `bitmap_writer_build_type_index()`Taylor Blau, Aug 15, 2024
  7. 3/8 pack-bitmap: drop redundant args from `bitmap_writer_build()`Taylor Blau, Aug 15, 2024
  8. 4/8 pack-bitmap: drop redundant args from `bitmap_writer_finish()`Taylor Blau, Aug 15, 2024
  9. 5/8 pack-bitmap-write.c: select pseudo-merges even for small bitmapsTaylor Blau, Aug 15, 2024
  10. Jeff KingAug 17, 2024
  11. Junio C HamanoAug 17, 2024
  12. Taylor BlauAug 29, 2024
  13. 6/8 t/t5333-pseudo-merge-bitmaps.sh: demonstrate empty pseudo-merge groupsTaylor Blau, Aug 15, 2024
  14. 7/8 pseudo-merge.c: do not generate empty pseudo-merge commitsTaylor Blau, Aug 15, 2024
  15. Jeff KingAug 17, 2024
  16. Taylor BlauAug 29, 2024
  17. 8/8 pseudo-merge.c: ensure pseudo-merge groups are closedTaylor Blau, Aug 15, 2024
  18. Jeff KingAug 17, 2024
  19. Jeff KingAug 17, 2024
  20. Taylor BlauAug 29, 2024

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.