Skip to content

Commit 777afaa

Browse files
committed
Merge branch 'tb/t0003-invoke-dd-more-portably'
Test portability fix. * tb/t0003-invoke-dd-more-portably: t0003: call dd with portable blocksize
2 parents abf2bb8 + 5458ba0 commit 777afaa

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

t/t0003-attributes.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ test_expect_success 'large attributes line ignores trailing content in tree' '
442442

443443
test_expect_success EXPENSIVE 'large attributes file ignored in tree' '
444444
test_when_finished "rm .gitattributes" &&
445-
dd if=/dev/zero of=.gitattributes bs=101M count=1 2>/dev/null &&
445+
dd if=/dev/zero of=.gitattributes bs=1048576 count=101 2>/dev/null &&
446446
git check-attr --all path >/dev/null 2>err &&
447447
echo "warning: ignoring overly large gitattributes file ${SQ}.gitattributes${SQ}" >expect &&
448448
test_cmp expect err
@@ -470,7 +470,7 @@ test_expect_success 'large attributes line ignores trailing content in index' '
470470

471471
test_expect_success EXPENSIVE 'large attributes file ignored in index' '
472472
test_when_finished "git update-index --remove .gitattributes" &&
473-
blob=$(dd if=/dev/zero bs=101M count=1 2>/dev/null | git hash-object -w --stdin) &&
473+
blob=$(dd if=/dev/zero bs=1048576 count=101 2>/dev/null | git hash-object -w --stdin) &&
474474
git update-index --add --cacheinfo 100644,$blob,.gitattributes &&
475475
git check-attr --cached --all path >/dev/null 2>err &&
476476
echo "warning: ignoring overly large gitattributes blob ${SQ}.gitattributes${SQ}" >expect &&

0 commit comments

Comments
 (0)