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>
Matthew Rogers committed
Jan 24, 2020 at 00:21 UTC
3de7ee369b198ea3c6a096a6f499fb3c8a368a9a
1 file changed
+84
-84
t/t1300-config.sh
+84
-84
@@ -1191,47 +1191,47 @@ test_expect_success 'old-fashioned settings are case insensitive' '
1191
test_when_finished "rm -f testConfig testConfig_expect testConfig_actual" &&
1192
1193
cat >testConfig_actual <<-EOF &&
1194
- [V.A]
1195
- r = value1
1194
+ [V.A]
1195
+ r = value1
1196
EOF
1197
q_to_tab >testConfig_expect <<-EOF &&
1198
- [V.A]
1199
- Qr = value2
1198
+ [V.A]
1199
+ Qr = value2
1200
EOF
1201
git config -f testConfig_actual "v.a.r" value2 &&
1202
test_cmp testConfig_expect testConfig_actual &&
1203
1204
cat >testConfig_actual <<-EOF &&
1205
- [V.A]
1206
- r = value1
1205
+ [V.A]
1206
+ r = value1
1207
EOF
1208
q_to_tab >testConfig_expect <<-EOF &&
1209
- [V.A]
1210
- QR = value2
1209
+ [V.A]
1210
+ QR = value2
1211
EOF
1212
git config -f testConfig_actual "V.a.R" value2 &&
1213
test_cmp testConfig_expect testConfig_actual &&
1214
1215
cat >testConfig_actual <<-EOF &&
1216
- [V.A]
1217
- r = value1
1216
+ [V.A]
1217
+ r = value1
1218
EOF
1219
q_to_tab >testConfig_expect <<-EOF &&
1220
- [V.A]
1221
- r = value1
1222
- Qr = value2
1220
+ [V.A]
1221
+ r = value1
1222
+ Qr = value2
1223
EOF
1224
git config -f testConfig_actual "V.A.r" value2 &&
1225
test_cmp testConfig_expect testConfig_actual &&
1226
1227
cat >testConfig_actual <<-EOF &&
1228
- [V.A]
1229
- r = value1
1228
+ [V.A]
1229
+ r = value1
1230
EOF
1231
q_to_tab >testConfig_expect <<-EOF &&
1232
- [V.A]
1233
- r = value1
1234
- Qr = value2
1232
+ [V.A]
1233
+ r = value1
1234
+ Qr = value2
1235
EOF
1236
git config -f testConfig_actual "v.A.r" value2 &&
1237
test_cmp testConfig_expect testConfig_actual
@@ -1241,26 +1241,26 @@ test_expect_success 'setting different case sensitive subsections ' '
1241
test_when_finished "rm -f testConfig testConfig_expect testConfig_actual" &&
1242
1243
cat >testConfig_actual <<-EOF &&
1244
- [V "A"]
1245
- R = v1
1246
- [K "E"]
1247
- Y = v1
1248
- [a "b"]
1249
- c = v1
1250
- [d "e"]
1251
- f = v1
1244
+ [V "A"]
1245
+ R = v1
1246
+ [K "E"]
1247
+ Y = v1
1248
+ [a "b"]
1249
+ c = v1
1250
+ [d "e"]
1251
+ f = v1
1252
EOF
1253
q_to_tab >testConfig_expect <<-EOF &&
1254
- [V "A"]
1255
- Qr = v2
1256
- [K "E"]
1257
- Qy = v2
1258
- [a "b"]
1259
- Qc = v2
1260
- [d "e"]
1261
- f = v1
1262
- [d "E"]
1263
- Qf = v2
1254
+ [V "A"]
1255
+ Qr = v2
1256
+ [K "E"]
1257
+ Qy = v2
1258
+ [a "b"]
1259
+ Qc = v2
1260
+ [d "e"]
1261
+ f = v1
1262
+ [d "E"]
1263
+ Qf = v2
1264
EOF
1265
# exact match
1266
git config -f testConfig_actual a.b.c v2 &&
@@ -1622,40 +1622,40 @@ test_expect_success 'set up --show-origin tests' '
1622
INCLUDE_DIR="$HOME/include" &&
1623
mkdir -p "$INCLUDE_DIR" &&
1624
cat >"$INCLUDE_DIR"/absolute.include <<-\EOF &&
1625
- [user]
1626
- absolute = include
1625
+ [user]
1626
+ absolute = include
1627
EOF
1628
cat >"$INCLUDE_DIR"/relative.include <<-\EOF &&
1629
- [user]
1630
- relative = include
1629
+ [user]
1630
+ relative = include
1631
EOF
1632
cat >"$HOME"/.gitconfig <<-EOF &&
1633
- [user]
1634
- global = true
1635
- override = global
1636
- [include]
1637
- path = "$INCLUDE_DIR/absolute.include"
1633
+ [user]
1634
+ global = true
1635
+ override = global
1636
+ [include]
1637
+ path = "$INCLUDE_DIR/absolute.include"
1638
EOF
1639
cat >.git/config <<-\EOF
1640
- [user]
1641
- local = true
1642
- override = local
1643
- [include]
1644
- path = ../include/relative.include
1640
+ [user]
1641
+ local = true
1642
+ override = local
1643
+ [include]
1644
+ path = ../include/relative.include
1645
EOF
1646
'
1647
1648
test_expect_success '--show-origin with --list' '
1649
cat >expect <<-EOF &&
1650
- file:$HOME/.gitconfig user.global=true
1651
- file:$HOME/.gitconfig user.override=global
1652
- file:$HOME/.gitconfig include.path=$INCLUDE_DIR/absolute.include
1653
- file:$INCLUDE_DIR/absolute.include user.absolute=include
1654
- file:.git/config user.local=true
1655
- file:.git/config user.override=local
1656
- file:.git/config include.path=../include/relative.include
1657
- file:.git/../include/relative.include user.relative=include
1658
- command line: user.cmdline=true
1650
+ file:$HOME/.gitconfig user.global=true
1651
+ file:$HOME/.gitconfig user.override=global
1652
+ file:$HOME/.gitconfig include.path=$INCLUDE_DIR/absolute.include
1653
+ file:$INCLUDE_DIR/absolute.include user.absolute=include
1654
+ file:.git/config user.local=true
1655
+ file:.git/config user.override=local
1656
+ file:.git/config include.path=../include/relative.include
1657
+ file:.git/../include/relative.include user.relative=include
1658
+ command line: user.cmdline=true
1659
EOF
1660
git -c user.cmdline=true config --list --show-origin >output &&
1661
test_cmp expect output
@@ -1663,16 +1663,16 @@ test_expect_success '--show-origin with --list' '
1663
1664
test_expect_success '--show-origin with --list --null' '
1665
cat >expect <<-EOF &&
1666
- file:$HOME/.gitconfigQuser.global
1667
- trueQfile:$HOME/.gitconfigQuser.override
1668
- globalQfile:$HOME/.gitconfigQinclude.path
1669
- $INCLUDE_DIR/absolute.includeQfile:$INCLUDE_DIR/absolute.includeQuser.absolute
1670
- includeQfile:.git/configQuser.local
1671
- trueQfile:.git/configQuser.override
1672
- localQfile:.git/configQinclude.path
1673
- ../include/relative.includeQfile:.git/../include/relative.includeQuser.relative
1674
- includeQcommand line:Quser.cmdline
1675
- trueQ
1666
+ file:$HOME/.gitconfigQuser.global
1667
+ trueQfile:$HOME/.gitconfigQuser.override
1668
+ globalQfile:$HOME/.gitconfigQinclude.path
1669
+ $INCLUDE_DIR/absolute.includeQfile:$INCLUDE_DIR/absolute.includeQuser.absolute
1670
+ includeQfile:.git/configQuser.local
1671
+ trueQfile:.git/configQuser.override
1672
+ localQfile:.git/configQinclude.path
1673
+ ../include/relative.includeQfile:.git/../include/relative.includeQuser.relative
1674
+ includeQcommand line:Quser.cmdline
1675
+ trueQ
1676
EOF
1677
git -c user.cmdline=true config --null --list --show-origin >output.raw &&
1678
nul_to_q <output.raw >output &&
@@ -1684,9 +1684,9 @@ test_expect_success '--show-origin with --list --null' '
1684
1685
test_expect_success '--show-origin with single file' '
1686
cat >expect <<-\EOF &&
1687
- file:.git/config user.local=true
1688
- file:.git/config user.override=local
1689
- file:.git/config include.path=../include/relative.include
1687
+ file:.git/config user.local=true
1688
+ file:.git/config user.override=local
1689
+ file:.git/config include.path=../include/relative.include
1690
EOF
1691
git config --local --list --show-origin >output &&
1692
test_cmp expect output
@@ -1694,8 +1694,8 @@ test_expect_success '--show-origin with single file' '
1694
1695
test_expect_success '--show-origin with --get-regexp' '
1696
cat >expect <<-EOF &&
1697
- file:$HOME/.gitconfig user.global true
1698
- file:.git/config user.local true
1697
+ file:$HOME/.gitconfig user.global true
1698
+ file:.git/config user.local true
1699
EOF
1700
git config --show-origin --get-regexp "user\.[g|l].*" >output &&
1701
test_cmp expect output
@@ -1703,7 +1703,7 @@ test_expect_success '--show-origin with --get-regexp' '
1703
1704
test_expect_success '--show-origin getting a single key' '
1705
cat >expect <<-\EOF &&
1706
- file:.git/config local
1706
+ file:.git/config local
1707
EOF
1708
git config --show-origin user.override >output &&
1709
test_cmp expect output
@@ -1712,14 +1712,14 @@ test_expect_success '--show-origin getting a single key' '
1712
test_expect_success 'set up custom config file' '
1713
CUSTOM_CONFIG_FILE="file\" (dq) and spaces.conf" &&
1714
cat >"$CUSTOM_CONFIG_FILE" <<-\EOF
1715
- [user]
1716
- custom = true
1715
+ [user]
1716
+ custom = true
1717
EOF
1718
'
1719
1720
test_expect_success !MINGW '--show-origin escape special file name characters' '
1721
cat >expect <<-\EOF &&
1722
- file:"file\" (dq) and spaces.conf" user.custom=true
1722
+ file:"file\" (dq) and spaces.conf" user.custom=true
1723
EOF
1724
git config --file "$CUSTOM_CONFIG_FILE" --show-origin --list >output &&
1725
test_cmp expect output
@@ -1727,7 +1727,7 @@ test_expect_success !MINGW '--show-origin escape special file name characters' '
1727
1728
test_expect_success '--show-origin stdin' '
1729
cat >expect <<-\EOF &&
1730
- standard input: user.custom=true
1730
+ standard input: user.custom=true
1731
EOF
1732
git config --file - --show-origin --list <"$CUSTOM_CONFIG_FILE" >output &&
1733
test_cmp expect output
@@ -1735,11 +1735,11 @@ test_expect_success '--show-origin stdin' '
1735
1736
test_expect_success '--show-origin stdin with file include' '
1737
cat >"$INCLUDE_DIR"/stdin.include <<-EOF &&
1738
- [user]
1739
- stdin = include
1738
+ [user]
1739
+ stdin = include
1740
EOF
1741
cat >expect <<-EOF &&
1742
- file:$INCLUDE_DIR/stdin.include include
1742
+ file:$INCLUDE_DIR/stdin.include include
1743
EOF
1744
echo "[include]path=\"$INCLUDE_DIR\"/stdin.include" |
1745
git config --show-origin --includes --file - user.stdin >output &&
@@ -1750,7 +1750,7 @@ test_expect_success '--show-origin stdin with file include' '
1750
test_expect_success !MINGW '--show-origin blob' '
1751
blob=$(git hash-object -w "$CUSTOM_CONFIG_FILE") &&
1752
cat >expect <<-EOF &&
1753
- blob:$blob user.custom=true
1753
+ blob:$blob user.custom=true
1754
EOF
1755
git config --blob=$blob --show-origin --list >output &&
1756
test_cmp expect output
@@ -1758,7 +1758,7 @@ test_expect_success !MINGW '--show-origin blob' '
1758
1759
test_expect_success !MINGW '--show-origin blob ref' '
1760
cat >expect <<-\EOF &&
1761
- blob:"master:file\" (dq) and spaces.conf" user.custom=true
1761
+ blob:"master:file\" (dq) and spaces.conf" user.custom=true
1762
EOF
1763
git add "$CUSTOM_CONFIG_FILE" &&
1764
git commit -m "new config file" &&