Merge branch 'bs/userdiff-php' into maint

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 1058d981dc85b2a7b63aca6e9cbb48f07e0a09a3..7649b810b1469724ff738fb0bf8b23ea61b37bda 100755 (executable)
--- 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' '