Sync with maint

diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 6ed23ee1d209bfa2bf4c607907eb35a37b478313..9c68b992511b7098df0570ca37e0add468a8a093 100755 (executable)
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -447,7 +447,7 @@ test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'pack-objects --threads=N or pack.
 
        git -c pack.threads=2 pack-objects --stdout --all </dev/null >/dev/null 2>err &&
        grep ^warning: err >warnings &&
-       test_must_fail test_line_count = 1 warnings &&
+       test_line_count = 1 warnings &&
        grep -F "no threads support, ignoring pack.threads" err &&
 
        git -c pack.threads=2 pack-objects --threads=4 --stdout --all </dev/null >/dev/null 2>err &&