headers: normalize the spelling of some header guards

diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
index ce69148ec111ccf83d01b392b5873d65d3dce226..2e718f0bdede397d399399536707743f9f7cff34 100755 (executable)
--- a/t/t5317-pack-objects-filter-objects.sh
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -20,8 +20,9 @@ test_expect_success 'setup r1' '
 '
 
 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 |
+       git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+               >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r1 pack-objects --rev --stdout >all.pack <<-EOF &&
@@ -29,12 +30,12 @@ test_expect_success 'verify blob count in normal packfile' '
        EOF
        git -C r1 index-pack ../all.pack &&
 
-       git -C r1 verify-pack -v ../all.pack |
-       grep blob |
+       git -C r1 verify-pack -v ../all.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 test_expect_success 'verify blob:none packfile has no blobs' '
@@ -43,8 +44,8 @@ test_expect_success 'verify blob:none packfile has no blobs' '
        EOF
        git -C r1 index-pack ../filter.pack &&
 
-       git -C r1 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r1 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -53,17 +54,17 @@ test_expect_success 'verify blob:none packfile has no blobs' '
 '
 
 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" |
+       git -C r1 verify-pack -v ../all.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >expected &&
 
-       git -C r1 verify-pack -v ../filter.pack |
-       grep -E "commit|tree" |
+       git -C r1 verify-pack -v ../filter.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 # Test blob:limit=<n>[kmg] filter.
@@ -82,8 +83,8 @@ test_expect_success 'setup r2' '
 '
 
 test_expect_success 'verify blob count in normal packfile' '
-       git -C r2 ls-files -s large.1000 large.10000 |
-       awk -f print_2.awk |
+       git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r2 pack-objects --rev --stdout >all.pack <<-EOF &&
@@ -91,12 +92,12 @@ test_expect_success 'verify blob count in normal packfile' '
        EOF
        git -C r2 index-pack ../all.pack &&
 
-       git -C r2 verify-pack -v ../all.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../all.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 test_expect_success 'verify blob:limit=500 omits all blobs' '
@@ -105,8 +106,8 @@ test_expect_success 'verify blob:limit=500 omits all blobs' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -120,8 +121,8 @@ test_expect_success 'verify blob:limit=1000' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
@@ -130,8 +131,8 @@ test_expect_success 'verify blob:limit=1000' '
 '
 
 test_expect_success 'verify blob:limit=1001' '
-       git -C r2 ls-files -s large.1000 |
-       awk -f print_2.awk |
+       git -C r2 ls-files -s large.1000 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
@@ -139,17 +140,17 @@ test_expect_success 'verify blob:limit=1001' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 test_expect_success 'verify blob:limit=10001' '
-       git -C r2 ls-files -s large.1000 large.10000 |
-       awk -f print_2.awk |
+       git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
@@ -157,17 +158,17 @@ test_expect_success 'verify blob:limit=10001' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 test_expect_success 'verify blob:limit=1k' '
-       git -C r2 ls-files -s large.1000 |
-       awk -f print_2.awk |
+       git -C r2 ls-files -s large.1000 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
@@ -175,17 +176,17 @@ test_expect_success 'verify blob:limit=1k' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 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 |
+       git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
@@ -194,17 +195,17 @@ test_expect_success 'verify explicitly specifying oversized blob in input' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 test_expect_success 'verify blob:limit=1m' '
-       git -C r2 ls-files -s large.1000 large.10000 |
-       awk -f print_2.awk |
+       git -C r2 ls-files -s large.1000 large.10000 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r2 pack-objects --rev --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
@@ -212,26 +213,26 @@ test_expect_success 'verify blob:limit=1m' '
        EOF
        git -C r2 index-pack ../filter.pack &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 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" |
+       git -C r2 verify-pack -v ../all.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >expected &&
 
-       git -C r2 verify-pack -v ../filter.pack |
-       grep -E "commit|tree" |
+       git -C r2 verify-pack -v ../filter.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 # Test sparse:path=<path> filter.
@@ -255,8 +256,9 @@ test_expect_success 'setup r3' '
 '
 
 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 |
+       git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
+               >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r3 pack-objects --rev --stdout >all.pack <<-EOF &&
@@ -264,17 +266,17 @@ test_expect_success 'verify blob count in normal packfile' '
        EOF
        git -C r3 index-pack ../all.pack &&
 
-       git -C r3 verify-pack -v ../all.pack |
-       grep blob |
+       git -C r3 verify-pack -v ../all.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 test_expect_success 'verify sparse:path=pattern1' '
-       git -C r3 ls-files -s dir1/sparse1 dir1/sparse2 |
-       awk -f print_2.awk |
+       git -C r3 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern1 >filter.pack <<-EOF &&
@@ -282,31 +284,31 @@ test_expect_success 'verify sparse:path=pattern1' '
        EOF
        git -C r3 index-pack ../filter.pack &&
 
-       git -C r3 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r3 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 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" |
+       git -C r3 verify-pack -v ../all.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >expected &&
 
-       git -C r3 verify-pack -v ../filter.pack |
-       grep -E "commit|tree" |
+       git -C r3 verify-pack -v ../filter.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 test_expect_success 'verify sparse:path=pattern2' '
-       git -C r3 ls-files -s sparse1 dir1/sparse1 |
-       awk -f print_2.awk |
+       git -C r3 ls-files -s sparse1 dir1/sparse1 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern2 >filter.pack <<-EOF &&
@@ -314,26 +316,26 @@ test_expect_success 'verify sparse:path=pattern2' '
        EOF
        git -C r3 index-pack ../filter.pack &&
 
-       git -C r3 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r3 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 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" |
+       git -C r3 verify-pack -v ../all.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >expected &&
 
-       git -C r3 verify-pack -v ../filter.pack |
-       grep -E "commit|tree" |
+       git -C r3 verify-pack -v ../filter.pack >verify_result &&
+       grep -E "commit|tree" verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 # Test sparse:oid=<oid-ish> filter.
@@ -356,8 +358,9 @@ test_expect_success 'setup r4' '
 '
 
 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 |
+       git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
+               >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r4 pack-objects --rev --stdout >all.pack <<-EOF &&
@@ -365,17 +368,17 @@ test_expect_success 'verify blob count in normal packfile' '
        EOF
        git -C r4 index-pack ../all.pack &&
 
-       git -C r4 verify-pack -v ../all.pack |
-       grep blob |
+       git -C r4 verify-pack -v ../all.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 test_expect_success 'verify sparse:oid=OID' '
-       git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 |
-       awk -f print_2.awk |
+       git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) &&
@@ -384,17 +387,17 @@ test_expect_success 'verify sparse:oid=OID' '
        EOF
        git -C r4 index-pack ../filter.pack &&
 
-       git -C r4 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r4 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 test_expect_success 'verify sparse:oid=oid-ish' '
-       git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 |
-       awk -f print_2.awk |
+       git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        git -C r4 pack-objects --rev --stdout --filter=sparse:oid=master:pattern >filter.pack <<-EOF &&
@@ -402,20 +405,21 @@ test_expect_success 'verify sparse:oid=oid-ish' '
        EOF
        git -C r4 index-pack ../filter.pack &&
 
-       git -C r4 verify-pack -v ../filter.pack |
-       grep blob |
+       git -C r4 verify-pack -v ../filter.pack >verify_result &&
+       grep blob verify_result |
        awk -f print_1.awk |
        sort >observed &&
 
-       test_cmp observed expected
+       test_cmp expected observed
 '
 
 # Delete some loose objects and use pack-objects, but WITHOUT any filtering.
 # 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 |
+       git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+               >ls_files_result &&
+       awk -f print_2.awk ls_files_result |
        sort >expected &&
 
        for id in `cat expected | sed "s|..|&/|"`