t1300: fix over-indented HERE-DOCs

Prepare for the following patches by removing extraneous indents from
HERE-DOCs used in config tests.

Signed-off-by: Matthew Rogers <mattr94@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 983a0a15839acf90aefec0a78d9ee1574dc7c445..e8b4575758a6539d80e9ab2de4074ec697d78a51 100755 (executable)
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -1191,47 +1191,47 @@ test_expect_success 'old-fashioned settings are case insensitive' '
        test_when_finished "rm -f testConfig testConfig_expect testConfig_actual" &&
 
        cat >testConfig_actual <<-EOF &&
-               [V.A]
-               r = value1
+       [V.A]
+       r = value1
        EOF
        q_to_tab >testConfig_expect <<-EOF &&
-               [V.A]
-               Qr = value2
+       [V.A]
+       Qr = value2
        EOF
        git config -f testConfig_actual "v.a.r" value2 &&
        test_cmp testConfig_expect testConfig_actual &&
 
        cat >testConfig_actual <<-EOF &&
-               [V.A]
-               r = value1
+       [V.A]
+       r = value1
        EOF
        q_to_tab >testConfig_expect <<-EOF &&
-               [V.A]
-               QR = value2
+       [V.A]
+       QR = value2
        EOF
        git config -f testConfig_actual "V.a.R" value2 &&
        test_cmp testConfig_expect testConfig_actual &&
 
        cat >testConfig_actual <<-EOF &&
-               [V.A]
-               r = value1
+       [V.A]
+       r = value1
        EOF
        q_to_tab >testConfig_expect <<-EOF &&
-               [V.A]
-               r = value1
-               Qr = value2
+       [V.A]
+       r = value1
+       Qr = value2
        EOF
        git config -f testConfig_actual "V.A.r" value2 &&
        test_cmp testConfig_expect testConfig_actual &&
 
        cat >testConfig_actual <<-EOF &&
-               [V.A]
-               r = value1
+       [V.A]
+       r = value1
        EOF
        q_to_tab >testConfig_expect <<-EOF &&
-               [V.A]
-               r = value1
-               Qr = value2
+       [V.A]
+       r = value1
+       Qr = value2
        EOF
        git config -f testConfig_actual "v.A.r" value2 &&
        test_cmp testConfig_expect testConfig_actual
@@ -1241,26 +1241,26 @@ test_expect_success 'setting different case sensitive subsections ' '
        test_when_finished "rm -f testConfig testConfig_expect testConfig_actual" &&
 
        cat >testConfig_actual <<-EOF &&
-               [V "A"]
-               R = v1
-               [K "E"]
-               Y = v1
-               [a "b"]
-               c = v1
-               [d "e"]
-               f = v1
+       [V "A"]
+       R = v1
+       [K "E"]
+       Y = v1
+       [a "b"]
+       c = v1
+       [d "e"]
+       f = v1
        EOF
        q_to_tab >testConfig_expect <<-EOF &&
-               [V "A"]
-               Qr = v2
-               [K "E"]
-               Qy = v2
-               [a "b"]
-               Qc = v2
-               [d "e"]
-               f = v1
-               [d "E"]
-               Qf = v2
+       [V "A"]
+       Qr = v2
+       [K "E"]
+       Qy = v2
+       [a "b"]
+       Qc = v2
+       [d "e"]
+       f = v1
+       [d "E"]
+       Qf = v2
        EOF
        # exact match
        git config -f testConfig_actual a.b.c v2 &&
@@ -1622,40 +1622,40 @@ test_expect_success 'set up --show-origin tests' '
        INCLUDE_DIR="$HOME/include" &&
        mkdir -p "$INCLUDE_DIR" &&
        cat >"$INCLUDE_DIR"/absolute.include <<-\EOF &&
-               [user]
-                       absolute = include
+       [user]
+               absolute = include
        EOF
        cat >"$INCLUDE_DIR"/relative.include <<-\EOF &&
-               [user]
-                       relative = include
+       [user]
+               relative = include
        EOF
        cat >"$HOME"/.gitconfig <<-EOF &&
-               [user]
-                       global = true
-                       override = global
-               [include]
-                       path = "$INCLUDE_DIR/absolute.include"
+       [user]
+               global = true
+               override = global
+       [include]
+               path = "$INCLUDE_DIR/absolute.include"
        EOF
        cat >.git/config <<-\EOF
-               [user]
-                       local = true
-                       override = local
-               [include]
-                       path = ../include/relative.include
+       [user]
+               local = true
+               override = local
+       [include]
+               path = ../include/relative.include
        EOF
 '
 
 test_expect_success '--show-origin with --list' '
        cat >expect <<-EOF &&
-               file:$HOME/.gitconfig   user.global=true
-               file:$HOME/.gitconfig   user.override=global
-               file:$HOME/.gitconfig   include.path=$INCLUDE_DIR/absolute.include
-               file:$INCLUDE_DIR/absolute.include      user.absolute=include
-               file:.git/config        user.local=true
-               file:.git/config        user.override=local
-               file:.git/config        include.path=../include/relative.include
-               file:.git/../include/relative.include   user.relative=include
-               command line:   user.cmdline=true
+       file:$HOME/.gitconfig   user.global=true
+       file:$HOME/.gitconfig   user.override=global
+       file:$HOME/.gitconfig   include.path=$INCLUDE_DIR/absolute.include
+       file:$INCLUDE_DIR/absolute.include      user.absolute=include
+       file:.git/config        user.local=true
+       file:.git/config        user.override=local
+       file:.git/config        include.path=../include/relative.include
+       file:.git/../include/relative.include   user.relative=include
+       command line:   user.cmdline=true
        EOF
        git -c user.cmdline=true config --list --show-origin >output &&
        test_cmp expect output
@@ -1663,16 +1663,16 @@ test_expect_success '--show-origin with --list' '
 
 test_expect_success '--show-origin with --list --null' '
        cat >expect <<-EOF &&
-               file:$HOME/.gitconfigQuser.global
-               trueQfile:$HOME/.gitconfigQuser.override
-               globalQfile:$HOME/.gitconfigQinclude.path
-               $INCLUDE_DIR/absolute.includeQfile:$INCLUDE_DIR/absolute.includeQuser.absolute
-               includeQfile:.git/configQuser.local
-               trueQfile:.git/configQuser.override
-               localQfile:.git/configQinclude.path
-               ../include/relative.includeQfile:.git/../include/relative.includeQuser.relative
-               includeQcommand line:Quser.cmdline
-               trueQ
+       file:$HOME/.gitconfigQuser.global
+       trueQfile:$HOME/.gitconfigQuser.override
+       globalQfile:$HOME/.gitconfigQinclude.path
+       $INCLUDE_DIR/absolute.includeQfile:$INCLUDE_DIR/absolute.includeQuser.absolute
+       includeQfile:.git/configQuser.local
+       trueQfile:.git/configQuser.override
+       localQfile:.git/configQinclude.path
+       ../include/relative.includeQfile:.git/../include/relative.includeQuser.relative
+       includeQcommand line:Quser.cmdline
+       trueQ
        EOF
        git -c user.cmdline=true config --null --list --show-origin >output.raw &&
        nul_to_q <output.raw >output &&
@@ -1684,9 +1684,9 @@ test_expect_success '--show-origin with --list --null' '
 
 test_expect_success '--show-origin with single file' '
        cat >expect <<-\EOF &&
-               file:.git/config        user.local=true
-               file:.git/config        user.override=local
-               file:.git/config        include.path=../include/relative.include
+       file:.git/config        user.local=true
+       file:.git/config        user.override=local
+       file:.git/config        include.path=../include/relative.include
        EOF
        git config --local --list --show-origin >output &&
        test_cmp expect output
@@ -1694,8 +1694,8 @@ test_expect_success '--show-origin with single file' '
 
 test_expect_success '--show-origin with --get-regexp' '
        cat >expect <<-EOF &&
-               file:$HOME/.gitconfig   user.global true
-               file:.git/config        user.local true
+       file:$HOME/.gitconfig   user.global true
+       file:.git/config        user.local true
        EOF
        git config --show-origin --get-regexp "user\.[g|l].*" >output &&
        test_cmp expect output
@@ -1703,7 +1703,7 @@ test_expect_success '--show-origin with --get-regexp' '
 
 test_expect_success '--show-origin getting a single key' '
        cat >expect <<-\EOF &&
-               file:.git/config        local
+       file:.git/config        local
        EOF
        git config --show-origin user.override >output &&
        test_cmp expect output
@@ -1712,14 +1712,14 @@ test_expect_success '--show-origin getting a single key' '
 test_expect_success 'set up custom config file' '
        CUSTOM_CONFIG_FILE="file\" (dq) and spaces.conf" &&
        cat >"$CUSTOM_CONFIG_FILE" <<-\EOF
-               [user]
-                       custom = true
+       [user]
+               custom = true
        EOF
 '
 
 test_expect_success !MINGW '--show-origin escape special file name characters' '
        cat >expect <<-\EOF &&
-               file:"file\" (dq) and spaces.conf"      user.custom=true
+       file:"file\" (dq) and spaces.conf"      user.custom=true
        EOF
        git config --file "$CUSTOM_CONFIG_FILE" --show-origin --list >output &&
        test_cmp expect output
@@ -1727,7 +1727,7 @@ test_expect_success !MINGW '--show-origin escape special file name characters' '
 
 test_expect_success '--show-origin stdin' '
        cat >expect <<-\EOF &&
-               standard input: user.custom=true
+       standard input: user.custom=true
        EOF
        git config --file - --show-origin --list <"$CUSTOM_CONFIG_FILE" >output &&
        test_cmp expect output
@@ -1735,11 +1735,11 @@ test_expect_success '--show-origin stdin' '
 
 test_expect_success '--show-origin stdin with file include' '
        cat >"$INCLUDE_DIR"/stdin.include <<-EOF &&
-               [user]
-                       stdin = include
+       [user]
+               stdin = include
        EOF
        cat >expect <<-EOF &&
-               file:$INCLUDE_DIR/stdin.include include
+       file:$INCLUDE_DIR/stdin.include include
        EOF
        echo "[include]path=\"$INCLUDE_DIR\"/stdin.include" |
        git config --show-origin --includes --file - user.stdin >output &&
@@ -1750,7 +1750,7 @@ test_expect_success '--show-origin stdin with file include' '
 test_expect_success !MINGW '--show-origin blob' '
        blob=$(git hash-object -w "$CUSTOM_CONFIG_FILE") &&
        cat >expect <<-EOF &&
-               blob:$blob      user.custom=true
+       blob:$blob      user.custom=true
        EOF
        git config --blob=$blob --show-origin --list >output &&
        test_cmp expect output
@@ -1758,7 +1758,7 @@ test_expect_success !MINGW '--show-origin blob' '
 
 test_expect_success !MINGW '--show-origin blob ref' '
        cat >expect <<-\EOF &&
-               blob:"master:file\" (dq) and spaces.conf"       user.custom=true
+       blob:"master:file\" (dq) and spaces.conf"       user.custom=true
        EOF
        git add "$CUSTOM_CONFIG_FILE" &&
        git commit -m "new config file" &&