From: Taylor Blau <me@ttaylorr.com>
To: git@vger.kernel.org, git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Derrick Stolee" <derrickstolee@github.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Emily Shaffer" <emilyshaffer@google.com>
Subject: [PATCH v3 0/2] gc: let feature.experimental imply gc.cruftPacks
Date: Wed, 26 Oct 2022 17:32:34 -0400 [thread overview]
Message-ID: <cover.1666819953.git.me@ttaylorr.com> (raw)
In-Reply-To: <cover.1666815209.git.me@ttaylorr.com>
This is a small reroll of an adopted version of Emily's series[1], which
I saw while sifting through old mail in my inbox.
This is substantively unchanged from the previous round, save:
- renaming the helper functions which assert and refute the existence
of cruft packs, and
- an additional test which ensures that we can opt out of cruft packs
via config
A range-diff is included below for convenience.
Thanks in advance for your review.
[1]: https://lore.kernel.org/git/20220803205721.3686361-1-emilyshaffer@google.com/
Emily Shaffer (2):
gc: add tests for --cruft and friends
config: let feature.experimental imply gc.cruftPacks=true
Documentation/config/feature.txt | 3 +
builtin/gc.c | 7 ++-
repo-settings.c | 1 +
repository.h | 1 +
t/t6500-gc.sh | 96 ++++++++++++++++++++++++++++++++
5 files changed, 106 insertions(+), 2 deletions(-)
Range-diff against v2:
1: 35d2c97715 ! 1: e8726f3de7 gc: add tests for --cruft and friends
@@ t/t6500-gc.sh: test_expect_success 'one of gc.reflogExpire{Unreachable,}=never d
+ git reset HEAD^^
+}
+
-+assert_cruft_pack_exists () {
++assert_cruft_packs () {
+ find .git/objects/pack -name "*.mtimes" >mtimes &&
+ sed -e 's/\.mtimes$/\.pack/g' mtimes >packs &&
+
@@ t/t6500-gc.sh: test_expect_success 'one of gc.reflogExpire{Unreachable,}=never d
+
+ prepare_cruft_history &&
+ git gc --cruft &&
-+ assert_cruft_pack_exists
++ assert_cruft_packs
+ )
+'
+
@@ t/t6500-gc.sh: test_expect_success 'one of gc.reflogExpire{Unreachable,}=never d
+
+ prepare_cruft_history &&
+ git -c gc.cruftPacks=true gc &&
-+ assert_cruft_pack_exists
++ assert_cruft_packs
+ )
+'
+
2: eb151752b8 ! 2: 13a25a425b config: let feature.experimental imply gc.cruftPacks=true
@@ repository.h: struct repo_settings {
int sparse_index;
## t/t6500-gc.sh ##
-@@ t/t6500-gc.sh: assert_cruft_pack_exists () {
+@@ t/t6500-gc.sh: assert_cruft_packs () {
done <packs
}
-+refute_cruft_packs_exist () {
++assert_no_cruft_packs () {
+ find .git/objects/pack -name "*.mtimes" >mtimes &&
+ test_must_be_empty mtimes
+}
@@ t/t6500-gc.sh: test_expect_success 'gc.cruftPacks=true generates a cruft pack' '
+
+ prepare_cruft_history &&
+ git -c feature.experimental=true gc &&
-+ assert_cruft_pack_exists
++ assert_cruft_packs
+ )
+'
+
@@ t/t6500-gc.sh: test_expect_success 'gc.cruftPacks=true generates a cruft pack' '
+
+ prepare_cruft_history &&
+ git -c gc.cruftPacks=true -c feature.experimental=false gc &&
-+ assert_cruft_pack_exists
++ assert_cruft_packs
++ )
++'
++
++test_expect_success 'feature.experimental=true can be overridden' '
++ git init crufts &&
++ test_when_finished "rm -fr crufts" &&
++ (
++ cd crufts &&
++
++ prepare_cruft_history &&
++ git -c feature.expiremental=true -c gc.cruftPacks=false gc &&
++ assert_no_cruft_packs
+ )
+'
+
@@ t/t6500-gc.sh: test_expect_success 'gc.cruftPacks=true generates a cruft pack' '
+
+ prepare_cruft_history &&
+ git -c feature.experimental=false gc &&
-+ refute_cruft_packs_exist
++ assert_no_cruft_packs
+ )
+'
+
--
2.38.0.16.g393fd4c6db
next prev parent reply other threads:[~2022-10-26 21:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-26 20:13 [PATCH v2 0/2] gc: let feature.experimental imply gc.cruftPacks Taylor Blau
2022-10-26 20:13 ` [PATCH v2 1/2] gc: add tests for --cruft and friends Taylor Blau
2022-10-26 21:03 ` Junio C Hamano
2022-10-26 20:13 ` [PATCH v2 2/2] config: let feature.experimental imply gc.cruftPacks=true Taylor Blau
2022-10-26 21:15 ` Junio C Hamano
2022-10-26 21:32 ` Taylor Blau
2022-10-26 20:53 ` [PATCH v2 0/2] gc: let feature.experimental imply gc.cruftPacks Junio C Hamano
2022-10-26 21:32 ` Taylor Blau [this message]
2022-10-26 21:32 ` [PATCH v3 1/2] gc: add tests for --cruft and friends Taylor Blau
2022-10-26 21:32 ` [PATCH v3 2/2] config: let feature.experimental imply gc.cruftPacks=true Taylor Blau
2022-10-31 10:46 ` Derrick Stolee
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.1666819953.git.me@ttaylorr.com \
--to=me@ttaylorr.com \
--cc=avarab@gmail.com \
--cc=derrickstolee@github.com \
--cc=emilyshaffer@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.