summaryrefslogtreecommitdiff
path: root/t/t1050-large.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-10-08 13:05:32 -0700
committerJunio C Hamano <gitster@pobox.com>2014-10-08 13:05:32 -0700
commitf0d89001750a27c1c447b2eb3149b998521fa52c (patch)
tree01a5829fe13f88fa399429c56fdc1d3f798309cf /t/t1050-large.sh
parent9342f49738a6b539b94a344fdfd45cf29c93ffcd (diff)
parent9079ab7cb6768fa04e086303f90be043b423cca4 (diff)
downloadgit-f0d89001750a27c1c447b2eb3149b998521fa52c.tar.gz
Merge branch 'sp/stream-clean-filter'
When running a required clean filter, we do not have to mmap the original before feeding the filter. Instead, stream the file contents directly to the filter and process its output. * sp/stream-clean-filter: sha1_file: don't convert off_t to size_t too early to avoid potential die() convert: stream from fd to required clean filter to reduce used address space copy_fd(): do not close the input file descriptor mmap_limit: introduce GIT_MMAP_LIMIT to allow testing expected mmap size memory_limit: use git_env_ulong() to parse GIT_ALLOC_LIMIT config.c: add git_env_ulong() to parse environment variable convert: drop arguments other than 'path' from would_convert_to_git()
Diffstat (limited to 't/t1050-large.sh')
-rwxr-xr-xt/t1050-large.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1050-large.sh b/t/t1050-large.sh
index 05a1e1d270..f5a9119290 100755
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -13,7 +13,7 @@ test_expect_success setup '
echo X | dd of=large2 bs=1k seek=2000 &&
echo X | dd of=large3 bs=1k seek=2000 &&
echo Y | dd of=huge bs=1k seek=2500 &&
- GIT_ALLOC_LIMIT=1500 &&
+ GIT_ALLOC_LIMIT=1500k &&
export GIT_ALLOC_LIMIT
'