From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org
Cc: Derrick Stolee <derrickstolee@github.com>,
Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/2] repack: make `collect_pack_filenames()` consistent
Date: Tue, 11 Jul 2023 13:32:31 -0400 [thread overview]
Message-ID: <cover.1689096750.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1689017830.git.me@ttaylorr.com>
Here is a small replacement for a series that Stolee and I worked on
together to make the behavior of `collect_pack_filenames()` consistent
with the rest of Git's pack liveness rules.
Nothing much has changed since v1, with the exception of removing
unnecessary conversions from 'ls' -> 'find ... | sort'. As always, a
range-diff is included below for convenience.
Thanks in advance for another look.
Derrick Stolee (1):
builtin/repack.c: only repack `.pack`s that exist
Taylor Blau (1):
builtin/repack.c: avoid dir traversal in `collect_pack_filenames()`
builtin/repack.c | 38 +++++++++++++++-----------------------
t/t7700-repack.sh | 36 +++++++++++++++++++++++++++++++++++-
2 files changed, 50 insertions(+), 24 deletions(-)
Range-diff against v1:
1: f14a88f107 ! 1: 410d2f0165 builtin/repack.c: only repack `.pack`s that exist
@@ t/t7700-repack.sh: test_expect_success 'repack --keep-pack' '
git config pack.window 0 &&
P1=$(commit_and_pack 1) &&
P2=$(commit_and_pack 2) &&
- P3=$(commit_and_pack 3) &&
- P4=$(commit_and_pack 4) &&
-- ls .git/objects/pack/*.pack >old-counts &&
-+ find .git/objects/pack -name "*.pack" -type f | sort >old-counts &&
- test_line_count = 4 old-counts &&
- git repack -a -d --keep-pack $P1 --keep-pack $P4 &&
-- ls .git/objects/pack/*.pack >new-counts &&
-+ find .git/objects/pack -name "*.pack" -type f | sort >new-counts &&
- grep -q $P1 new-counts &&
- grep -q $P4 new-counts &&
- test_line_count = 3 new-counts &&
@@ t/t7700-repack.sh: test_expect_success 'repack --keep-pack' '
mv "$from" "$to" || return 1
done &&
@@ t/t7700-repack.sh: test_expect_success 'repack --keep-pack' '
+ # repacking what we can.
+ touch .git/objects/pack/pack-does-not-exist.idx &&
+
-+ find .git/objects/pack -name "*.pack" -type f | sort >packs.before &&
git repack --cruft -d --keep-pack $P1 --keep-pack $P4 &&
-+ find .git/objects/pack -name "*.pack" -type f | sort >packs.after &&
-- ls .git/objects/pack/*.pack >newer-counts &&
-- test_cmp new-counts newer-counts &&
-+ test_cmp packs.before packs.after &&
- git fsck
+ ls .git/objects/pack/*.pack >newer-counts &&
+@@ t/t7700-repack.sh: test_expect_success 'repack --keep-pack' '
)
'
@@ t/t7700-repack.sh: test_expect_success 'repack --keep-pack' '
+ P2=$(commit_and_pack 2) &&
+ P3=$(commit_and_pack 3) &&
+ P4=$(commit_and_pack 4) &&
-+ find .git/objects/pack -name "*.pack" -type f | sort >old-counts &&
++ ls .git/objects/pack/*.pack >old-counts &&
+ test_line_count = 4 old-counts &&
+
+ # Remove one .pack file
+ rm .git/objects/pack/$P2 &&
+
-+ find .git/objects/pack -name "*.pack" -type f |
-+ sort >before-pack-dir &&
++ ls .git/objects/pack/*.pack >before-pack-dir &&
+
+ test_must_fail git fsck &&
+ test_must_fail git repack --cruft -d 2>err &&
@@ t/t7700-repack.sh: test_expect_success 'repack --keep-pack' '
+
+ # Before failing, the repack did not modify the
+ # pack directory.
-+ find .git/objects/pack -name "*.pack" -type f |
-+ sort >after-pack-dir &&
++ ls .git/objects/pack/*.pack >after-pack-dir &&
+ test_cmp before-pack-dir after-pack-dir
+ )
+'
2: b3d0d9308e = 2: ffdf85f6d3 builtin/repack.c: avoid dir traversal in `collect_pack_filenames()`
--
2.41.0.329.gffdf85f6d39
next prev parent reply other threads:[~2023-07-11 17:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-10 19:37 [PATCH 0/2] repack: make `collect_pack_filenames()` consistent Taylor Blau
2023-07-10 19:37 ` [PATCH 1/2] builtin/repack.c: only repack `.pack`s that exist Taylor Blau
2023-07-10 20:09 ` Junio C Hamano
2023-07-11 17:28 ` Taylor Blau
2023-07-10 19:37 ` [PATCH 2/2] builtin/repack.c: avoid dir traversal in `collect_pack_filenames()` Taylor Blau
2023-07-10 21:35 ` Junio C Hamano
2023-07-11 17:29 ` Taylor Blau
2023-07-11 17:32 ` Taylor Blau [this message]
2023-07-11 17:32 ` [PATCH v2 1/2] builtin/repack.c: only repack `.pack`s that exist Taylor Blau
2023-07-11 17:32 ` [PATCH v2 2/2] builtin/repack.c: avoid dir traversal in `collect_pack_filenames()` 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.1689096750.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=derrickstolee@github.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 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.