diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-30 14:24:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-30 14:24:23 -0800 |
| commit | 777afaaa5c9cefc640e3a32346ebc79e0c73f9a6 (patch) | |
| tree | 510de8b268e2d37f176b2debc57ad94c497fa4a8 /t | |
| parent | abf2bb895b429e9fefc478d9c230bf74622be620 (diff) | |
| parent | 5458ba0a4d2c65ddf7c844fd976906e04f61569a (diff) | |
| download | git-777afaaa5c9cefc640e3a32346ebc79e0c73f9a6.tar.gz | |
Merge branch 'tb/t0003-invoke-dd-more-portably'
Test portability fix.
* tb/t0003-invoke-dd-more-portably:
t0003: call dd with portable blocksize
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0003-attributes.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index a8af15b91c..89b306cb11 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -442,7 +442,7 @@ test_expect_success 'large attributes line ignores trailing content in tree' ' test_expect_success EXPENSIVE 'large attributes file ignored in tree' ' test_when_finished "rm .gitattributes" && - dd if=/dev/zero of=.gitattributes bs=101M count=1 2>/dev/null && + dd if=/dev/zero of=.gitattributes bs=1048576 count=101 2>/dev/null && git check-attr --all path >/dev/null 2>err && echo "warning: ignoring overly large gitattributes file ${SQ}.gitattributes${SQ}" >expect && test_cmp expect err @@ -470,7 +470,7 @@ test_expect_success 'large attributes line ignores trailing content in index' ' test_expect_success EXPENSIVE 'large attributes file ignored in index' ' test_when_finished "git update-index --remove .gitattributes" && - blob=$(dd if=/dev/zero bs=101M count=1 2>/dev/null | git hash-object -w --stdin) && + blob=$(dd if=/dev/zero bs=1048576 count=101 2>/dev/null | git hash-object -w --stdin) && git update-index --add --cacheinfo 100644,$blob,.gitattributes && git check-attr --cached --all path >/dev/null 2>err && echo "warning: ignoring overly large gitattributes blob ${SQ}.gitattributes${SQ}" >expect && |