From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>,
Elijah Newren <newren@gmail.com>
Subject: [PATCH v2 0/2] pack-objects: more brown-paper-bag multi-pack reuse fixes
Date: Thu, 14 Nov 2024 08:42:05 -0500 [thread overview]
Message-ID: <cover.1731591708.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1731518931.git.me@ttaylorr.com>
This is a small re-roll of my series to fix a regression in multi-pack
reuse based on a broken assumption in write_reused_pack_verbatim().
The only change since last time is removing a stray debugging aid, and
the series is otherwise identical as in v1. A range-diff is included
below for convenience.
Thanks in advance for your review!
Taylor Blau (2):
t5332-multi-pack-reuse.sh: demonstrate duplicate packing failure
pack-objects: only perform verbatim reuse on the preferred pack
builtin/pack-objects.c | 101 +++++++++++++++---------------------
t/t5332-multi-pack-reuse.sh | 22 ++++++++
2 files changed, 65 insertions(+), 58 deletions(-)
Range-diff against v1:
1: 7a69cf84ae5 ! 1: d791b7b20c9 t5332-multi-pack-reuse.sh: demonstrate duplicate packing failure
@@ t/t5332-multi-pack-reuse.sh: test_expect_success 'duplicate objects' '
+
+ # ...and create a separate pack containing just that object
+ p="$(git pack-objects $packdir/pack <in)" &&
-+ git show-index <$packdir/pack-$p.idx &&
+
+ git multi-pack-index write --bitmap --preferred-pack=pack-$p.idx &&
+
2: 2520abf24a8 = 2: d73b8fe2d63 pack-objects: only perform verbatim reuse on the preferred pack
base-commit: 25b0f41288718625b18495de23cc066394c09a92
--
2.46.0.421.g159f2d50e75
next prev parent reply other threads:[~2024-11-14 13:42 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-13 17:32 [PATCH 0/2] pack-objects: more brown-paper-bag multi-pack reuse fixes Taylor Blau
2024-11-13 17:32 ` [PATCH 1/2] t5332-multi-pack-reuse.sh: demonstrate duplicate packing failure Taylor Blau
2024-11-14 1:12 ` Junio C Hamano
2024-11-14 13:37 ` Taylor Blau
2024-11-13 17:32 ` [PATCH 2/2] pack-objects: only perform verbatim reuse on the preferred pack Taylor Blau
2024-11-14 0:25 ` Jeff King
2024-11-14 13:40 ` Taylor Blau
2024-11-15 9:57 ` Jeff King
2024-11-22 9:16 ` Kristoffer Haugsbakk
2024-11-14 13:42 ` Taylor Blau [this message]
2024-11-14 13:42 ` [PATCH v2 1/2] t5332-multi-pack-reuse.sh: demonstrate duplicate packing failure Taylor Blau
2024-11-14 13:42 ` [PATCH v2 2/2] pack-objects: only perform verbatim reuse on the preferred pack Taylor Blau
2024-11-22 4:44 ` Junio C Hamano
2024-11-22 8:33 ` Jeff King
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.1731591708.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.