]> git.ipfire.org Git - thirdparty/git.git/commitdiff
t/t7704-repack-cruft.sh: consolidate `write_blob()`
authorTaylor Blau <me@ttaylorr.com>
Wed, 19 Mar 2025 22:52:51 +0000 (18:52 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Mar 2025 10:42:06 +0000 (03:42 -0700)
A previous commit moved a handful of tests from a different script into
t7704, including one that relies on generating random blobs.

Incidentally, the original home of this test defined its own helper
"write_blob" for doing so, which is identical in function to our
"generate_random_blob" (and is slightly inferior to the latter, which
cleans up after itself).

Rewrite the test that uses "write_blob" to no longer do so and then
remove the function.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Acked-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7704-repack-cruft.sh

index e6e4c2fad87706569f64d943fa7e84f07882e2fd..3fd5aa608972037b10ff18a02835d59f763e054a 100755 (executable)
@@ -618,11 +618,6 @@ test_expect_success 'cruft repack with no reachable objects' '
        )
 '
 
-write_blob () {
-       test-tool genrandom "$@" >in &&
-       git hash-object -w -t blob in
-}
-
 find_pack () {
        for idx in $(ls $packdir/pack-*.idx)
        do
@@ -641,8 +636,8 @@ test_expect_success 'cruft repack with --max-pack-size' '
                test_commit base &&
 
                # two cruft objects which exceed the maximum pack size
-               foo=$(write_blob foo 1048576) &&
-               bar=$(write_blob bar 1048576) &&
+               foo=$(generate_random_blob foo 1048576) &&
+               bar=$(generate_random_blob bar 1048576) &&
                test-tool chmtime --get -1000 \
                        "$objdir/$(test_oid_to_path $foo)" >foo.mtime &&
                test-tool chmtime --get -2000 \