aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorNicolas Pitre <nico@fluxnic.net>2010-02-08 10:39:01 -0500
committerJunio C Hamano <gitster@pobox.com>2010-02-08 10:56:21 -0800
commit720c9f7bda20d8f307745772374647c1a2076b3d (patch)
tree9ee5753432d01904f1a8f5f987abfcd9e0422180 /t
parent8051a030617cf7d083568cca223bdaa15052c33f (diff)
downloadgit-720c9f7bda20d8f307745772374647c1a2076b3d.tar.gz
git-720c9f7bda20d8f307745772374647c1a2076b3d.tar.xz
Revert "pack-objects: fix pack generation when using pack_size_limit"
This reverts most of commit a2430dde8ceaaaabf05937438249397b883ca77a. That commit made the situation better for repositories with relatively small number of objects. However with many objects and a small pack size limit, the time required to complete the repack tends towards O(n^2), or even much worse with long delta chains. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t5300-pack-object.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 1058d981d..7649b810b 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -389,7 +389,7 @@ test_expect_success 'verify resulting packs' '
test_expect_success 'tolerate packsizelimit smaller than biggest object' '
git config pack.packSizeLimit 1 &&
packname_11=$(git pack-objects test-11 <obj-list) &&
- test 3 = $(ls test-11-*.pack | wc -l)
+ test 5 = $(ls test-11-*.pack | wc -l)
'
test_expect_success 'verify resulting packs' '