Merge branch 'en/fetch-negotiation-default-fix'

[thirdparty/git.git] / t / t5317-pack-objects-filter-objects.sh

diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
index 13ed3eb13652dcf07727f2a64b2b1f999604459c..33b740ce628f834a339154bd05d1acb5a1bbe4b7 100755 (executable)
--- a/t/t5317-pack-objects-filter-objects.sh
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -16,9 +16,9 @@ test_expect_success 'setup r1' '
        git init r1 &&
        for n in 1 2 3 4 5
        do
-               echo "This is file: $n" > r1/file.$n
-               git -C r1 add file.$n
-               git -C r1 commit -m "$n"
+               echo "This is file: $n" > r1/file.$n &&
+               git -C r1 add file.$n &&
+               git -C r1 commit -m "$n" || return 1
        done
 '
 
@@ -116,9 +116,9 @@ test_expect_success 'setup r2' '
        git init r2 &&
        for n in 1000 10000
        do
-               printf "%"$n"s" X > r2/large.$n
-               git -C r2 add large.$n
-               git -C r2 commit -m "$n"
+               printf "%"$n"s" X > r2/large.$n &&
+               git -C r2 add large.$n &&
+               git -C r2 commit -m "$n" || return 1
        done
 '
 
@@ -278,10 +278,10 @@ test_expect_success 'setup r3' '
        mkdir r3/dir1 &&
        for n in sparse1 sparse2
        do
-               echo "This is file: $n" > r3/$n
-               git -C r3 add $n
-               echo "This is file: dir1/$n" > r3/dir1/$n
-               git -C r3 add dir1/$n
+               echo "This is file: $n" > r3/$n &&
+               git -C r3 add $n &&
+               echo "This is file: dir1/$n" > r3/dir1/$n &&
+               git -C r3 add dir1/$n || return 1
        done &&
        git -C r3 commit -m "sparse" &&
        echo dir1/ >pattern1 &&
@@ -331,10 +331,10 @@ test_expect_success 'setup r4' '
        mkdir r4/dir1 &&
        for n in sparse1 sparse2
        do
-               echo "This is file: $n" > r4/$n
-               git -C r4 add $n
-               echo "This is file: dir1/$n" > r4/dir1/$n
-               git -C r4 add dir1/$n
+               echo "This is file: $n" > r4/$n &&
+               git -C r4 add $n &&
+               echo "This is file: dir1/$n" > r4/dir1/$n &&
+               git -C r4 add dir1/$n || return 1
        done &&
        echo dir1/ >r4/pattern &&
        git -C r4 add pattern &&
@@ -409,7 +409,7 @@ test_expect_success 'setup r1 - delete loose blobs' '
 
        for id in `cat expected | sed "s|..|&/|"`
        do
-               rm r1/.git/objects/$id
+               rm r1/.git/objects/$id || return 1
        done
 '