diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-12-29 01:21:33 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-12-29 01:21:33 -0800 |
commit | 78d4096d573ae796f72e5b05bf1c332f038e54dd (patch) | |
tree | ccf6e1a04397f44f55497a51466336582473f3c8 /t | |
parent | 373654ee0f568fdeab891c621d6a1ac6b0c15d3a (diff) | |
parent | 1415be8f0f86c6d2aa2cb014c3cc32dd92e9c43a (diff) | |
download | git-78d4096d573ae796f72e5b05bf1c332f038e54dd.tar.gz git-78d4096d573ae796f72e5b05bf1c332f038e54dd.tar.xz |
Merge branch 'np/auto-thread'
* np/auto-thread:
Force t5302 to use a single thread
pack-objects: don't use too many threads with few objects
autodetect number of CPUs by default when using threads
Diffstat (limited to 't')
-rwxr-xr-x | t/t5302-pack-index.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh index 884e24253..e6f70d474 100755 --- a/t/t5302-pack-index.sh +++ b/t/t5302-pack-index.sh @@ -10,6 +10,7 @@ test_expect_success \ 'setup' \ 'rm -rf .git git init && + git config pack.threads 1 && i=1 && while test $i -le 100 do |