tests: standardize pipe placement

Instead of using a line-continuation and pipe on the second line, take
advantage of the shell's implicit line continuation after a pipe
character.  So for example, instead of

some long line \
| next line

use

some long line |
next line

And add a blank line before and after the pipe where it aids readability
(it usually does).

This better matches the coding style documented in
Documentation/CodingGuidelines and used in shell scripts elsewhere in
the tree.

Signed-off-by: Matthew DeVore <matvore@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 3fe02876c1fc7e4f7488c1534a4745f5760f1ca0..f1277bef4fa65e72607ea1f2dac326048559e6aa 100755 (executable)
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -57,9 +57,12 @@ then
                echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
                        --passphrase-fd 0 --pinentry-mode loopback \
                        --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
                echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
                        --passphrase-fd 0 --pinentry-mode loopback \
                        --import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&

-               gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K \
-                       | grep fingerprint: | cut -d" " -f4 | tr -d '\n' > \
-                       ${GNUPGHOME}/trustlist.txt &&
+
+               gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K |
+               grep fingerprint: |
+               cut -d" " -f4 |
+               tr -d '\n' >"${GNUPGHOME}/trustlist.txt" &&
+

                echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
                (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
                echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
                echo " S relax" >> ${GNUPGHOME}/trustlist.txt &&
                (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
                echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \

diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 7f19d591f250bd61f7d25a5e5e0fae2ca1d8f118..83980b7887085312993a854b1e4c856fa3089e24 100755 (executable)
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -218,8 +218,8 @@ test_expect_success "--batch-check for a non-existent hash" '
     test "0000000000000000000000000000000000000042 missing
 0000000000000000000000000000000000000084 missing" = \
     "$( ( echo 0000000000000000000000000000000000000042;
     test "0000000000000000000000000000000000000042 missing
 0000000000000000000000000000000000000084 missing" = \
     "$( ( echo 0000000000000000000000000000000000000042;

-         echo_without_newline 0000000000000000000000000000000000000084; ) \
-       | git cat-file --batch-check)"
+        echo_without_newline 0000000000000000000000000000000000000084; ) |
+       git cat-file --batch-check)"

 '
 
 test_expect_success "--batch for an existent and a non-existent hash" '
 '
 
 test_expect_success "--batch for an existent and a non-existent hash" '


@@ -227,8 +227,8 @@ test_expect_success "--batch for an existent and a non-existent hash" '
 $tag_content
 0000000000000000000000000000000000000000 missing" = \
     "$( ( echo $tag_sha1;
 $tag_content
 0000000000000000000000000000000000000000 missing" = \
     "$( ( echo $tag_sha1;

-         echo_without_newline 0000000000000000000000000000000000000000; ) \
-       | git cat-file --batch)"
+        echo_without_newline 0000000000000000000000000000000000000000; ) |
+       git cat-file --batch)"

 '
 
 test_expect_success "--batch-check for an empty line" '
 '
 
 test_expect_success "--batch-check for an empty line" '

diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index cdf1fed5d1c33e659b5d2c9bfb64423b13f05e94..5869d6cb62ddc41c4b53148a1609181c20c5fb83 100755 (executable)
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -1770,8 +1770,9 @@ test_expect_success '--show-origin stdin with file include' '
        cat >expect <<-EOF &&
                file:$INCLUDE_DIR/stdin.include include
        EOF
        cat >expect <<-EOF &&
                file:$INCLUDE_DIR/stdin.include include
        EOF

-       echo "[include]path=\"$INCLUDE_DIR\"/stdin.include" \
-               | git config --show-origin --includes --file - user.stdin >output &&
+       echo "[include]path=\"$INCLUDE_DIR\"/stdin.include" |
+       git config --show-origin --includes --file - user.stdin >output &&
+

        test_cmp expect output
 '
 
        test_cmp expect output
 '
 

diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
index 6710c8bc8c4699035bec418258fcaec8a634855c..ce69148ec111ccf83d01b392b5873d65d3dce226 100755 (executable)
--- a/t/t5317-pack-objects-filter-objects.sh
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -20,17 +20,20 @@ test_expect_success 'setup r1' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '

-       git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        git -C r1 pack-objects --rev --stdout >all.pack <<-EOF &&
        HEAD
        EOF
        git -C r1 index-pack ../all.pack &&
        git -C r1 pack-objects --rev --stdout >all.pack <<-EOF &&
        HEAD
        EOF
        git -C r1 index-pack ../all.pack &&

-       git -C r1 verify-pack -v ../all.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r1 verify-pack -v ../all.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
        test_cmp observed expected
 '
 


@@ -39,23 +42,27 @@ test_expect_success 'verify blob:none packfile has no blobs' '
        HEAD
        EOF
        git -C r1 index-pack ../filter.pack &&
        HEAD
        EOF
        git -C r1 index-pack ../filter.pack &&

-       git -C r1 verify-pack -v ../filter.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r1 verify-pack -v ../filter.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        nr=$(wc -l <observed) &&
        test 0 -eq $nr
 '
 
 test_expect_success 'verify normal and blob:none packfiles have same commits/trees' '
        nr=$(wc -l <observed) &&
        test 0 -eq $nr
 '
 
 test_expect_success 'verify normal and blob:none packfiles have same commits/trees' '

-       git -C r1 verify-pack -v ../all.pack \
-               | grep -E "commit|tree" \
-               | awk -f print_1.awk \
-               | sort >expected &&
-       git -C r1 verify-pack -v ../filter.pack \
-               | grep -E "commit|tree" \
-               | awk -f print_1.awk \
-               | sort >observed &&
+       git -C r1 verify-pack -v ../all.pack |
+       grep -E "commit|tree" |
+       awk -f print_1.awk |
+       sort >expected &&
+
+       git -C r1 verify-pack -v ../filter.pack |
+       grep -E "commit|tree" |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
        test_cmp observed expected
 '
 


@@ -75,17 +82,20 @@ test_expect_success 'setup r2' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '

-       git -C r2 ls-files -s large.1000 large.10000 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r2 ls-files -s large.1000 large.10000 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        git -C r2 pack-objects --rev --stdout >all.pack <<-EOF &&
        HEAD
        EOF
        git -C r2 index-pack ../all.pack &&
        git -C r2 pack-objects --rev --stdout >all.pack <<-EOF &&
        HEAD
        EOF
        git -C r2 index-pack ../all.pack &&

-       git -C r2 verify-pack -v ../all.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r2 verify-pack -v ../all.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
        test_cmp observed expected
 '
 


@@ -94,10 +104,12 @@ test_expect_success 'verify blob:limit=500 omits all blobs' '
        HEAD
        EOF
        git -C r2 index-pack ../filter.pack &&
        HEAD
        EOF
        git -C r2 index-pack ../filter.pack &&

-       git -C r2 verify-pack -v ../filter.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r2 verify-pack -v ../filter.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        nr=$(wc -l <observed) &&
        test 0 -eq $nr
 '
        nr=$(wc -l <observed) &&
        test 0 -eq $nr
 '


@@ -107,99 +119,118 @@ test_expect_success 'verify blob:limit=1000' '
        HEAD
        EOF
        git -C r2 index-pack ../filter.pack &&
        HEAD
        EOF
        git -C r2 index-pack ../filter.pack &&

-       git -C r2 verify-pack -v ../filter.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r2 verify-pack -v ../filter.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        nr=$(wc -l <observed) &&
        test 0 -eq $nr
 '
 
 test_expect_success 'verify blob:limit=1001' '
        nr=$(wc -l <observed) &&
        test 0 -eq $nr
 '
 
 test_expect_success 'verify blob:limit=1001' '

-       git -C r2 ls-files -s large.1000 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r2 ls-files -s large.1000 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r2 index-pack ../filter.pack &&
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r2 index-pack ../filter.pack &&

-       git -C r2 verify-pack -v ../filter.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r2 verify-pack -v ../filter.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=10001' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=10001' '

-       git -C r2 ls-files -s large.1000 large.10000 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r2 ls-files -s large.1000 large.10000 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        git -C r2 pack-objects --rev --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r2 index-pack ../filter.pack &&
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r2 index-pack ../filter.pack &&

-       git -C r2 verify-pack -v ../filter.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r2 verify-pack -v ../filter.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=1k' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=1k' '

-       git -C r2 ls-files -s large.1000 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r2 ls-files -s large.1000 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r2 index-pack ../filter.pack &&
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r2 index-pack ../filter.pack &&

-       git -C r2 verify-pack -v ../filter.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r2 verify-pack -v ../filter.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify explicitly specifying oversized blob in input' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify explicitly specifying oversized blob in input' '

-       git -C r2 ls-files -s large.1000 large.10000 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r2 ls-files -s large.1000 large.10000 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
        HEAD
        $(git -C r2 rev-parse HEAD:large.10000)
        EOF
        git -C r2 index-pack ../filter.pack &&
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
        HEAD
        $(git -C r2 rev-parse HEAD:large.10000)
        EOF
        git -C r2 index-pack ../filter.pack &&

-       git -C r2 verify-pack -v ../filter.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r2 verify-pack -v ../filter.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=1m' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=1m' '

-       git -C r2 ls-files -s large.1000 large.10000 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r2 ls-files -s large.1000 large.10000 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r2 index-pack ../filter.pack &&
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r2 index-pack ../filter.pack &&

-       git -C r2 verify-pack -v ../filter.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r2 verify-pack -v ../filter.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify normal and blob:limit packfiles have same commits/trees' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify normal and blob:limit packfiles have same commits/trees' '

-       git -C r2 verify-pack -v ../all.pack \
-               | grep -E "commit|tree" \
-               | awk -f print_1.awk \
-               | sort >expected &&
-       git -C r2 verify-pack -v ../filter.pack \
-               | grep -E "commit|tree" \
-               | awk -f print_1.awk \
-               | sort >observed &&
+       git -C r2 verify-pack -v ../all.pack |
+       grep -E "commit|tree" |
+       awk -f print_1.awk |
+       sort >expected &&
+
+       git -C r2 verify-pack -v ../filter.pack |
+       grep -E "commit|tree" |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
        test_cmp observed expected
 '
 


@@ -224,71 +255,84 @@ test_expect_success 'setup r3' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '

-       git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        git -C r3 pack-objects --rev --stdout >all.pack <<-EOF &&
        HEAD
        EOF
        git -C r3 index-pack ../all.pack &&
        git -C r3 pack-objects --rev --stdout >all.pack <<-EOF &&
        HEAD
        EOF
        git -C r3 index-pack ../all.pack &&

-       git -C r3 verify-pack -v ../all.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r3 verify-pack -v ../all.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify sparse:path=pattern1' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify sparse:path=pattern1' '

-       git -C r3 ls-files -s dir1/sparse1 dir1/sparse2 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r3 ls-files -s dir1/sparse1 dir1/sparse2 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern1 >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r3 index-pack ../filter.pack &&
        git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern1 >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r3 index-pack ../filter.pack &&

-       git -C r3 verify-pack -v ../filter.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r3 verify-pack -v ../filter.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify normal and sparse:path=pattern1 packfiles have same commits/trees' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify normal and sparse:path=pattern1 packfiles have same commits/trees' '

-       git -C r3 verify-pack -v ../all.pack \
-               | grep -E "commit|tree" \
-               | awk -f print_1.awk \
-               | sort >expected &&
-       git -C r3 verify-pack -v ../filter.pack \
-               | grep -E "commit|tree" \
-               | awk -f print_1.awk \
-               | sort >observed &&
+       git -C r3 verify-pack -v ../all.pack |
+       grep -E "commit|tree" |
+       awk -f print_1.awk |
+       sort >expected &&
+
+       git -C r3 verify-pack -v ../filter.pack |
+       grep -E "commit|tree" |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify sparse:path=pattern2' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify sparse:path=pattern2' '

-       git -C r3 ls-files -s sparse1 dir1/sparse1 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r3 ls-files -s sparse1 dir1/sparse1 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern2 >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r3 index-pack ../filter.pack &&
        git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern2 >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r3 index-pack ../filter.pack &&

-       git -C r3 verify-pack -v ../filter.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r3 verify-pack -v ../filter.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify normal and sparse:path=pattern2 packfiles have same commits/trees' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify normal and sparse:path=pattern2 packfiles have same commits/trees' '

-       git -C r3 verify-pack -v ../all.pack \
-               | grep -E "commit|tree" \
-               | awk -f print_1.awk \
-               | sort >expected &&
-       git -C r3 verify-pack -v ../filter.pack \
-               | grep -E "commit|tree" \
-               | awk -f print_1.awk \
-               | sort >observed &&
+       git -C r3 verify-pack -v ../all.pack |
+       grep -E "commit|tree" |
+       awk -f print_1.awk |
+       sort >expected &&
+
+       git -C r3 verify-pack -v ../filter.pack |
+       grep -E "commit|tree" |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
        test_cmp observed expected
 '
 


@@ -312,48 +356,57 @@ test_expect_success 'setup r4' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '

-       git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        git -C r4 pack-objects --rev --stdout >all.pack <<-EOF &&
        HEAD
        EOF
        git -C r4 index-pack ../all.pack &&
        git -C r4 pack-objects --rev --stdout >all.pack <<-EOF &&
        HEAD
        EOF
        git -C r4 index-pack ../all.pack &&

-       git -C r4 verify-pack -v ../all.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r4 verify-pack -v ../all.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify sparse:oid=OID' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify sparse:oid=OID' '

-       git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) &&
        git -C r4 pack-objects --rev --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r4 index-pack ../filter.pack &&
        oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) &&
        git -C r4 pack-objects --rev --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r4 index-pack ../filter.pack &&

-       git -C r4 verify-pack -v ../filter.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r4 verify-pack -v ../filter.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify sparse:oid=oid-ish' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify sparse:oid=oid-ish' '

-       git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        git -C r4 pack-objects --rev --stdout --filter=sparse:oid=master:pattern >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r4 index-pack ../filter.pack &&
        git -C r4 pack-objects --rev --stdout --filter=sparse:oid=master:pattern >filter.pack <<-EOF &&
        HEAD
        EOF
        git -C r4 index-pack ../filter.pack &&

-       git -C r4 verify-pack -v ../filter.pack \
-               | grep blob \
-               | awk -f print_1.awk \
-               | sort >observed &&
+
+       git -C r4 verify-pack -v ../filter.pack |
+       grep blob |
+       awk -f print_1.awk |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
        test_cmp observed expected
 '
 


@@ -361,9 +414,10 @@ test_expect_success 'verify sparse:oid=oid-ish' '
 # This models previously omitted objects that we did not receive.
 
 test_expect_success 'setup r1 - delete loose blobs' '
 # This models previously omitted objects that we did not receive.
 
 test_expect_success 'setup r1 - delete loose blobs' '

-       git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        for id in `cat expected | sed "s|..|&/|"`
        do
                rm r1/.git/objects/$id
        for id in `cat expected | sed "s|..|&/|"`
        do
                rm r1/.git/objects/$id

diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 1b5a4a6d380f37b0e616e5ca6c5fd5b732e6383d..086f2c40f68ffaf666a09d88b86709133559fc91 100755 (executable)
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -50,8 +50,11 @@ pull_to_client () {
                        case "$heads" in *B*)
                            git update-ref refs/heads/B "$BTIP";;
                        esac &&
                        case "$heads" in *B*)
                            git update-ref refs/heads/B "$BTIP";;
                        esac &&

-                       git symbolic-ref HEAD refs/heads/$(echo $heads \
-                               | sed -e "s/^\(.\).*$/\1/") &&
+
+                       git symbolic-ref HEAD refs/heads/$(
+                               echo $heads |
+                               sed -e "s/^\(.\).*$/\1/"
+                       ) &&

 
                        git fsck --full &&
 
 
                        git fsck --full &&
 

diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index bbbe7537dfd315a567c6dc5583804325e6f10235..e4d032c9dbc1896cccf2f3006b97b718184ad133 100755 (executable)
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -34,10 +34,12 @@ test_expect_success 'setup bare clone for server' '
 # confirm partial clone was registered in the local config.
 test_expect_success 'do partial clone 1' '
        git clone --no-checkout --filter=blob:none "file://$(pwd)/srv.bare" pc1 &&
 # confirm partial clone was registered in the local config.
 test_expect_success 'do partial clone 1' '
        git clone --no-checkout --filter=blob:none "file://$(pwd)/srv.bare" pc1 &&

-       git -C pc1 rev-list HEAD --quiet --objects --missing=print \
-               | awk -f print_1.awk \
-               | sed "s/?//" \
-               | sort >observed.oids &&
+
+       git -C pc1 rev-list HEAD --quiet --objects --missing=print |
+       awk -f print_1.awk |
+       sed "s/?//" |
+       sort >observed.oids &&
+

        test_cmp expect_1.oids observed.oids &&
        test "$(git -C pc1 config --local core.repositoryformatversion)" = "1" &&
        test "$(git -C pc1 config --local extensions.partialclone)" = "origin" &&
        test_cmp expect_1.oids observed.oids &&
        test "$(git -C pc1 config --local core.repositoryformatversion)" = "1" &&
        test "$(git -C pc1 config --local extensions.partialclone)" = "origin" &&


@@ -130,16 +132,20 @@ test_expect_success 'push new commits to server for file.3.txt' '
 # perhaps combined with a command in dry-run mode.
 test_expect_success 'manual prefetch of missing objects' '
        git -C pc1 fetch --filter=blob:none origin &&
 # perhaps combined with a command in dry-run mode.
 test_expect_success 'manual prefetch of missing objects' '
        git -C pc1 fetch --filter=blob:none origin &&

-       git -C pc1 rev-list master..origin/master --quiet --objects --missing=print \
-               | awk -f print_1.awk \
-               | sed "s/?//" \
-               | sort >observed.oids &&
+
+       git -C pc1 rev-list master..origin/master --quiet --objects --missing=print |
+       awk -f print_1.awk |
+       sed "s/?//" |
+       sort >observed.oids &&
+

        test_line_count = 6 observed.oids &&
        git -C pc1 fetch-pack --stdin "file://$(pwd)/srv.bare" <observed.oids &&
        test_line_count = 6 observed.oids &&
        git -C pc1 fetch-pack --stdin "file://$(pwd)/srv.bare" <observed.oids &&

-       git -C pc1 rev-list master..origin/master --quiet --objects --missing=print \
-               | awk -f print_1.awk \
-               | sed "s/?//" \
-               | sort >observed.oids &&
+
+       git -C pc1 rev-list master..origin/master --quiet --objects --missing=print |
+       awk -f print_1.awk |
+       sed "s/?//" |
+       sort >observed.oids &&
+

        test_line_count = 0 observed.oids
 '
 
        test_line_count = 0 observed.oids
 '
 


@@ -194,7 +200,7 @@ test_expect_success 'upon cloning, check that all refs point to objects' '
 
        # Craft a packfile not including that blob.
        git -C "$SERVER" rev-parse HEAD |
 
        # Craft a packfile not including that blob.
        git -C "$SERVER" rev-parse HEAD |

-               git -C "$SERVER" pack-objects --stdout >incomplete.pack &&
+       git -C "$SERVER" pack-objects --stdout >incomplete.pack &&

 
        # Replace the existing packfile with the crafted one. The protocol
        # requires that the packfile be sent in sideband 1, hence the extra
 
        # Replace the existing packfile with the crafted one. The protocol
        # requires that the packfile be sent in sideband 1, hence the extra

diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
index d4ff0b3bef61b5d3de1ab0fad4695949d80dc8fd..0f6b569e197eb3f15f2c5a2cad2c3eb09e2be3b9 100755 (executable)
--- a/t/t6112-rev-list-filters-objects.sh
+++ b/t/t6112-rev-list-filters-objects.sh
@@ -20,24 +20,28 @@ test_expect_success 'setup r1' '
 '
 
 test_expect_success 'verify blob:none omits all 5 blobs' '
 '
 
 test_expect_success 'verify blob:none omits all 5 blobs' '

-       git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
-               | awk -f print_2.awk \
-               | sort >expected &&
-       git -C r1 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:none \
-               | awk -f print_1.awk \
-               | sed "s/~//" \
-               | sort >observed &&
+       git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
+       awk -f print_2.awk |
+       sort >expected &&
+
+       git -C r1 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:none |
+       awk -f print_1.awk |
+       sed "s/~//" |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify emitted+omitted == all' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify emitted+omitted == all' '

-       git -C r1 rev-list HEAD --objects \
-               | awk -f print_1.awk \
-               | sort >expected &&
-       git -C r1 rev-list HEAD --objects --filter-print-omitted --filter=blob:none \
-               | awk -f print_1.awk \
-               | sed "s/~//" \
-               | sort >observed &&
+       git -C r1 rev-list HEAD --objects |
+       awk -f print_1.awk |
+       sort >expected &&
+
+       git -C r1 rev-list HEAD --objects --filter-print-omitted --filter=blob:none |
+       awk -f print_1.awk |
+       sed "s/~//" |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
        test_cmp observed expected
 '
 


@@ -58,65 +62,76 @@ test_expect_success 'setup r2' '
 '
 
 test_expect_success 'verify blob:limit=500 omits all blobs' '
 '
 
 test_expect_success 'verify blob:limit=500 omits all blobs' '

-       git -C r2 ls-files -s large.1000 large.10000 \
-               | awk -f print_2.awk \
-               | sort >expected &&
-       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=500 \
-               | awk -f print_1.awk \
-               | sed "s/~//" \
-               | sort >observed &&
+       git -C r2 ls-files -s large.1000 large.10000 |
+       awk -f print_2.awk |
+       sort >expected &&
+
+       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=500 |
+       awk -f print_1.awk |
+       sed "s/~//" |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify emitted+omitted == all' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify emitted+omitted == all' '

-       git -C r2 rev-list HEAD --objects \
-               | awk -f print_1.awk \
-               | sort >expected &&
-       git -C r2 rev-list HEAD --objects --filter-print-omitted --filter=blob:limit=500 \
-               | awk -f print_1.awk \
-               | sed "s/~//" \
-               | sort >observed &&
+       git -C r2 rev-list HEAD --objects |
+       awk -f print_1.awk |
+       sort >expected &&
+
+       git -C r2 rev-list HEAD --objects --filter-print-omitted --filter=blob:limit=500 |
+       awk -f print_1.awk |
+       sed "s/~//" |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=1000' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=1000' '

-       git -C r2 ls-files -s large.1000 large.10000 \
-               | awk -f print_2.awk \
-               | sort >expected &&
-       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1000 \
-               | awk -f print_1.awk \
-               | sed "s/~//" \
-               | sort >observed &&
+       git -C r2 ls-files -s large.1000 large.10000 |
+       awk -f print_2.awk |
+       sort >expected &&
+
+       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1000 |
+       awk -f print_1.awk |
+       sed "s/~//" |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=1001' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=1001' '

-       git -C r2 ls-files -s large.10000 \
-               | awk -f print_2.awk \
-               | sort >expected &&
-       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1001 \
-               | awk -f print_1.awk \
-               | sed "s/~//" \
-               | sort >observed &&
+       git -C r2 ls-files -s large.10000 |
+       awk -f print_2.awk |
+       sort >expected &&
+
+       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1001 |
+       awk -f print_1.awk |
+       sed "s/~//" |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=1k' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=1k' '

-       git -C r2 ls-files -s large.10000 \
-               | awk -f print_2.awk \
-               | sort >expected &&
-       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1k \
-               | awk -f print_1.awk \
-               | sed "s/~//" \
-               | sort >observed &&
+       git -C r2 ls-files -s large.10000 |
+       awk -f print_2.awk |
+       sort >expected &&
+
+       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1k |
+       awk -f print_1.awk |
+       sed "s/~//" |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=1m' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify blob:limit=1m' '

-       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1m \
-               | awk -f print_1.awk \
-               | sed "s/~//" \
-               | sort >observed &&
+       git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1m |
+       awk -f print_1.awk |
+       sed "s/~//" |
+       sort >observed &&
+

        test_must_be_empty observed
 '
 
        test_must_be_empty observed
 '
 


@@ -141,24 +156,28 @@ test_expect_success 'setup r3' '
 '
 
 test_expect_success 'verify sparse:path=pattern1 omits top-level files' '
 '
 
 test_expect_success 'verify sparse:path=pattern1 omits top-level files' '

-       git -C r3 ls-files -s sparse1 sparse2 \
-               | awk -f print_2.awk \
-               | sort >expected &&
-       git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:path=../pattern1 \
-               | awk -f print_1.awk \
-               | sed "s/~//" \
-               | sort >observed &&
+       git -C r3 ls-files -s sparse1 sparse2 |
+       awk -f print_2.awk |
+       sort >expected &&
+
+       git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:path=../pattern1 |
+       awk -f print_1.awk |
+       sed "s/~//" |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify sparse:path=pattern2 omits both sparse2 files' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify sparse:path=pattern2 omits both sparse2 files' '

-       git -C r3 ls-files -s sparse2 dir1/sparse2 \
-               | awk -f print_2.awk \
-               | sort >expected &&
-       git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:path=../pattern2 \
-               | awk -f print_1.awk \
-               | sed "s/~//" \
-               | sort >observed &&
+       git -C r3 ls-files -s sparse2 dir1/sparse2 |
+       awk -f print_2.awk |
+       sort >expected &&
+
+       git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:path=../pattern2 |
+       awk -f print_1.awk |
+       sed "s/~//" |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
        test_cmp observed expected
 '
 


@@ -173,25 +192,30 @@ test_expect_success 'setup r3 part 2' '
 '
 
 test_expect_success 'verify sparse:oid=OID omits top-level files' '
 '
 
 test_expect_success 'verify sparse:oid=OID omits top-level files' '

-       git -C r3 ls-files -s pattern sparse1 sparse2 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r3 ls-files -s pattern sparse1 sparse2 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        oid=$(git -C r3 ls-files -s pattern | awk -f print_2.awk) &&
        oid=$(git -C r3 ls-files -s pattern | awk -f print_2.awk) &&

-       git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:oid=$oid \
-               | awk -f print_1.awk \
-               | sed "s/~//" \
-               | sort >observed &&
+
+       git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:oid=$oid |
+       awk -f print_1.awk |
+       sed "s/~//" |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
 test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '
        test_cmp observed expected
 '
 
 test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '

-       git -C r3 ls-files -s pattern sparse1 sparse2 \
-               | awk -f print_2.awk \
-               | sort >expected &&
-       git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:oid=master:pattern \
-               | awk -f print_1.awk \
-               | sed "s/~//" \
-               | sort >observed &&
+       git -C r3 ls-files -s pattern sparse1 sparse2 |
+       awk -f print_2.awk |
+       sort >expected &&
+
+       git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:oid=master:pattern |
+       awk -f print_1.awk |
+       sed "s/~//" |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
        test_cmp observed expected
 '
 


@@ -199,17 +223,20 @@ test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '
 # This models previously omitted objects that we did not receive.
 
 test_expect_success 'rev-list W/ --missing=print' '
 # This models previously omitted objects that we did not receive.
 
 test_expect_success 'rev-list W/ --missing=print' '

-       git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
-               | awk -f print_2.awk \
-               | sort >expected &&
+       git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 |
+       awk -f print_2.awk |
+       sort >expected &&
+

        for id in `cat expected | sed "s|..|&/|"`
        do
                rm r1/.git/objects/$id
        done &&
        for id in `cat expected | sed "s|..|&/|"`
        do
                rm r1/.git/objects/$id
        done &&

-       git -C r1 rev-list --quiet HEAD --missing=print --objects \
-               | awk -f print_1.awk \
-               | sed "s/?//" \
-               | sort >observed &&
+
+       git -C r1 rev-list --quiet HEAD --missing=print --objects |
+       awk -f print_1.awk |
+       sed "s/?//" |
+       sort >observed &&
+

        test_cmp observed expected
 '
 
        test_cmp observed expected
 '