Merge branch 'cc/mailmap-tuxfamily'

diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 38a06aaafc72a337b1d25c9f18715dec4b2208f4..2e0ba3ebd8ab3273144743dc38675e2b5d429ea1 100755 (executable)
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -35,6 +35,7 @@ echo "$@"'
 ###
 
 test_expect_success 'empty stream succeeds' '
+       git config fastimport.unpackLimit 0 &&
        git fast-import </dev/null
 '
 
@@ -2673,6 +2674,7 @@ test_expect_success 'R: blob bigger than threshold' '
        echo >>input &&
 
        test_create_repo R &&
+       git --git-dir=R/.git config fastimport.unpackLimit 0 &&
        git --git-dir=R/.git fast-import --big-file-threshold=1 <input
 '