Merge branch 'sp/maint-fd-limit'

diff --git a/t/t4133-apply-filenames.sh b/t/t4133-apply-filenames.sh
index 34218071b64600812acef5b5e3277346889eda7f..94da99075c55c790aae7a260ff6c4964f950c47c 100755 (executable)
--- a/t/t4133-apply-filenames.sh
+++ b/t/t4133-apply-filenames.sh
@@ -8,7 +8,7 @@ test_description='git apply filename consistency check'
 . ./test-lib.sh
 
 test_expect_success setup '
-       cat > bad1.patch <<EOF
+       cat > bad1.patch <<EOF &&
 diff --git a/f b/f
 new file mode 100644
 index 0000000..d00491f
@@ -29,9 +29,9 @@ EOF
 '
 
 test_expect_success 'apply diff with inconsistent filenames in headers' '
-       test_must_fail git apply bad1.patch 2>err
-       grep "inconsistent new filename" err
-       test_must_fail git apply bad2.patch 2>err
+       test_must_fail git apply bad1.patch 2>err &&
+       grep "inconsistent new filename" err &&
+       test_must_fail git apply bad2.patch 2>err &&
        grep "inconsistent old filename" err
 '