git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/8] pseudo-merge: avoid empty and non-closed pseudo-merge commits
Date: Thu, 15 Aug 2024 13:30:56 -0400	[thread overview]
Message-ID: <cover.1723743050.git.me@ttaylorr.com> (raw)

This series fixes a couple of small issues with pseudo-merge groups,
where it is possible to (a) select pseudo-merges that are not closed
over reachability with respect to the bitmap's pack or MIDX, and (b)
generate empty pseudo-merge commits.

The series is structured as follows:

  - The first four commits refactor the pack-bitmap machinery to make
    the bitmap_writer's packing_data structure available earlier at
    selection time, and then remove redundant arguments from the rest of
    the API as a result of that change.

  - The fifth commit makes it so we select pseudo-merges even in small
    repositories, making it easier to write tests in the remainder of
    the series.

  - The next two commits demonstrate and fix a case where we would
    generate empty pseudo-merge commits (see (b) above).

  - The final commit ensures that we do not generate pseudo-merge groups
    which reach objects not contained in the bitmap's pack or MIDX (see
    (a) above).

The bug described in (a) was noticed by Peff, and the remaining seven
commits are preparatory, and/or fixing other small issues I noticed
along the way while investigating the original impetus for this series.

Thanks in advance for your review!

Taylor Blau (8):
  pack-bitmap: initialize `bitmap_writer_init()` with packing_data
  pack-bitmap: drop redundant args from
    `bitmap_writer_build_type_index()`
  pack-bitmap: drop redundant args from `bitmap_writer_build()`
  pack-bitmap: drop redundant args from `bitmap_writer_finish()`
  pack-bitmap-write.c: select pseudo-merges even for small bitmaps
  t/t5333-pseudo-merge-bitmaps.sh: demonstrate empty pseudo-merge groups
  pseudo-merge.c: do not generate empty pseudo-merge commits
  pseudo-merge.c: ensure pseudo-merge groups are closed

 builtin/pack-objects.c          |  8 ++---
 midx-write.c                    | 10 +++---
 pack-bitmap-write.c             | 37 +++++++++++-----------
 pack-bitmap.h                   | 11 +++----
 pseudo-merge.c                  | 13 +++++---
 t/t5333-pseudo-merge-bitmaps.sh | 56 +++++++++++++++++++++++++++++++++
 6 files changed, 96 insertions(+), 39 deletions(-)


base-commit: 406f326d271e0bacecdb00425422c5fa3f314930
-- 
2.46.0.54.gc9a64b1d2a

             reply	other threads:[~2024-08-15 17:30 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-15 17:30 Taylor Blau [this message]
2024-08-15 17:31 ` [PATCH 1/8] pack-bitmap: initialize `bitmap_writer_init()` with packing_data Taylor Blau
2024-08-17 10:31   ` Jeff King
2024-08-29 19:00     ` Taylor Blau
2024-08-29 19:36       ` Jeff King
2024-08-15 17:31 ` [PATCH 2/8] pack-bitmap: drop redundant args from `bitmap_writer_build_type_index()` Taylor Blau
2024-08-15 17:31 ` [PATCH 3/8] pack-bitmap: drop redundant args from `bitmap_writer_build()` Taylor Blau
2024-08-15 17:31 ` [PATCH 4/8] pack-bitmap: drop redundant args from `bitmap_writer_finish()` Taylor Blau
2024-08-15 17:31 ` [PATCH 5/8] pack-bitmap-write.c: select pseudo-merges even for small bitmaps Taylor Blau
2024-08-17 10:34   ` Jeff King
2024-08-17 16:42     ` Junio C Hamano
2024-08-29 19:01     ` Taylor Blau
2024-08-15 17:31 ` [PATCH 6/8] t/t5333-pseudo-merge-bitmaps.sh: demonstrate empty pseudo-merge groups Taylor Blau
2024-08-15 17:31 ` [PATCH 7/8] pseudo-merge.c: do not generate empty pseudo-merge commits Taylor Blau
2024-08-17 10:38   ` Jeff King
2024-08-29 19:03     ` Taylor Blau
2024-08-15 17:31 ` [PATCH 8/8] pseudo-merge.c: ensure pseudo-merge groups are closed Taylor Blau
2024-08-17 10:43   ` Jeff King
2024-08-17 10:44 ` [PATCH 0/8] pseudo-merge: avoid empty and non-closed pseudo-merge commits Jeff King
2024-08-29 19:04   ` Taylor Blau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cover.1723743050.git.me@ttaylorr.com \
    --to=me@ttaylorr.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).