From: Taylor Blau <me@ttaylorr.com>
To: Derrick Stolee <derrickstolee@github.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, chakrabortyabhradeep79@gmail.com
Subject: Re: [PATCH] test-lib-functions: fix test_subcommand_inexact
Date: Thu, 24 Mar 2022 12:02:30 -0400 [thread overview]
Message-ID: <YjyWFqjkaGpC8NxQ@nand.local> (raw)
In-Reply-To: <72c54461-8af7-29fc-04da-f435adee9bbe@github.com>
On Thu, Mar 24, 2022 at 11:42:44AM -0400, Derrick Stolee wrote:
> As I'm looking at Taylor's test case example, the one thing I notice
> is that there is only one pack-file before the repack. It would be
> good to have a non-kept packfile get repacked in the process, not
> just the loose objects added by the test_commit. I'll take a look at
> what can be done here.
I think you are too good at nerd-sniping me ;-). Here's a more robust
test, that I think reads a little cleaner than the previous round. Let
me know what you think:
--- 8< ---
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 5922fb5bdd..1ed9a98a36 100755
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -369,10 +369,36 @@ test_expect_success '--write-midx with preferred bitmap tips' '
)
'
+packdir=$objdir/pack
+
test_expect_success '--write-midx -b packs non-kept objects' '
- GIT_TRACE2_EVENT="$(pwd)/trace.txt" \
- git repack --write-midx -a -b &&
- test_subcommand_inexact git pack-objects --honor-pack-keep <trace.txt
+ git init repo &&
+ test_when_finished "rm -fr repo" &&
+ (
+ cd repo &&
+
+ test_commit kept &&
+ git repack -ad &&
+
+ >$packdir/$(basename $packdir/pack-*.pack .pack).keep &&
+
+ test_commit unkept &&
+ git repack -d &&
+
+ test_commit new &&
+
+ find $packdir -type f -name "pack-*.idx" | sort >before &&
+ git repack --write-midx -a -b -d &&
+ find $packdir -type f -name "pack-*.idx" | sort >after &&
+
+ git rev-list --objects --no-object-names kept.. >expect.raw &&
+ sort expect.raw >expect &&
+
+ git show-index <$(comm -13 before after) >actual.raw &&
+ cut -d" " -f2 actual.raw >actual &&
+
+ test_cmp expect actual
+ )
'
test_expect_success TTY '--quiet disables progress' '
--- >8 ---
Thanks,
Taylor
next prev parent reply other threads:[~2022-03-24 16:02 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-21 20:34 [PATCH] test-lib-functions: fix test_subcommand_inexact Derrick Stolee via GitGitGadget
2022-03-22 15:17 ` Derrick Stolee
2022-03-23 14:53 ` Junio C Hamano
2022-03-23 14:55 ` Derrick Stolee
2022-03-23 21:45 ` Taylor Blau
2022-03-23 23:10 ` Junio C Hamano
2022-03-24 15:42 ` Derrick Stolee
2022-03-24 16:02 ` Taylor Blau [this message]
2022-03-24 16:39 ` Derrick Stolee
2022-03-24 16:38 ` Junio C Hamano
2022-03-24 18:10 ` Abhradeep Chakraborty
2022-03-25 0:33 ` Junio C Hamano
2022-03-25 8:13 ` Abhradeep Chakraborty
2022-03-24 18:34 ` [PATCH v2 0/2] " Derrick Stolee via GitGitGadget
2022-03-24 18:34 ` [PATCH v2 1/2] t7700: check post-condition in kept-pack test Derrick Stolee via GitGitGadget
2022-03-24 18:58 ` Taylor Blau
2022-03-25 13:55 ` Derrick Stolee
2022-03-25 17:07 ` Junio C Hamano
2022-03-25 17:23 ` Derrick Stolee
2022-03-25 17:36 ` Taylor Blau
2022-03-25 18:22 ` Junio C Hamano
2022-03-24 18:34 ` [PATCH v2 2/2] test-lib-functions: fix test_subcommand_inexact Derrick Stolee via GitGitGadget
2022-03-24 18:49 ` Taylor Blau
2022-03-24 20:48 ` Junio C Hamano
2022-03-25 14:03 ` Derrick Stolee
2022-03-25 17:25 ` Junio C Hamano
2022-03-25 19:02 ` [PATCH v3 0/2] " Derrick Stolee via GitGitGadget
2022-03-25 19:02 ` [PATCH v3 1/2] t7700: check post-condition in kept-pack test Derrick Stolee via GitGitGadget
2022-03-25 19:02 ` [PATCH v3 2/2] test-lib-functions: remove test_subcommand_inexact Derrick Stolee via GitGitGadget
2022-03-30 2:44 ` [PATCH v3 0/2] test-lib-functions: fix test_subcommand_inexact 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=YjyWFqjkaGpC8NxQ@nand.local \
--to=me@ttaylorr.com \
--cc=chakrabortyabhradeep79@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--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 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).