diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-12 13:37:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-12 13:37:17 -0700 |
| commit | c2f79440acc0d24e5a8a61648cf92055cf4ca5c8 (patch) | |
| tree | 2688507a4338ccace103b84648c569b424e74913 /t | |
| parent | b8bdb2f2835c9877120651cc9f22eaca6f8f66a8 (diff) | |
| parent | e7c3d1ddba0b3eb9d52780588636833055830c6f (diff) | |
| download | git-c2f79440acc0d24e5a8a61648cf92055cf4ca5c8.tar.gz | |
Merge branch 'jk/cap-exclude-file-size'
An overly large ".gitignore" files are now rejected silently.
* jk/cap-exclude-file-size:
dir.c: reduce max pattern file size to 100MB
dir.c: skip .gitignore, etc larger than INT_MAX
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0008-ignores.sh | 8 | ||||
| -rwxr-xr-x | t/t6112-rev-list-filters-objects.sh | 12 |
2 files changed, 20 insertions, 0 deletions
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh index 361446b2f4..02a18d4fdb 100755 --- a/t/t0008-ignores.sh +++ b/t/t0008-ignores.sh @@ -945,4 +945,12 @@ test_expect_success SYMLINKS 'symlinks not respected in-tree' ' test_grep "unable to access.*gitignore" err ' +test_expect_success EXPENSIVE 'large exclude file ignored in tree' ' + test_when_finished "rm .gitignore" && + dd if=/dev/zero of=.gitignore bs=101M count=1 && + git ls-files -o --exclude-standard 2>err && + echo "warning: ignoring excessively large pattern file: .gitignore" >expect && + test_cmp expect err +' + test_done diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh index 43e1afd44c..0387f35a32 100755 --- a/t/t6112-rev-list-filters-objects.sh +++ b/t/t6112-rev-list-filters-objects.sh @@ -701,4 +701,16 @@ test_expect_success 'expand blob limit in protocol' ' grep "blob:limit=1024" trace ' +test_expect_success EXPENSIVE 'large sparse filter file ignored' ' + blob=$(dd if=/dev/zero bs=101M count=1 | + git hash-object -w --stdin) && + test_must_fail \ + git rev-list --all --objects --filter=sparse:oid=$blob 2>err && + cat >expect <<-EOF && + warning: ignoring excessively large pattern blob: $blob + fatal: unable to parse sparse filter data in $blob + EOF + test_cmp expect err +' + test_done |