Browse Source

Merge branch 'tb/t0003-invoke-dd-more-portably'

Test portability fix.

* tb/t0003-invoke-dd-more-portably:
  t0003: call dd with portable blocksize
maint
Junio C Hamano 2 years ago
parent
commit
777afaaa5c
  1. 4
      t/t0003-attributes.sh

4
t/t0003-attributes.sh

@ -442,7 +442,7 @@ test_expect_success 'large attributes line ignores trailing content in tree' ' @@ -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' ' @@ -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 &&

Loading…
Cancel
Save