modernize t9300: wrap lines after &&
It is customary to have each command in test snippets on its own line. Fix those instances that do not follow this guideline. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jeff King <peff@peff.net>
Johannes Sixt committed
Nov 19, 2015 at 20:09 UTC
ec2c10bef8e4a586935d350afd06a421bd7d2f80
1 file changed
+32
-16
t/t9300-fast-import.sh
+32
-16
@@ -130,17 +130,20 @@ test_expect_success 'A: verify tree' '
130
131
echo "$file2_data" >expect
132
test_expect_success 'A: verify file2' '
133
- git cat-file blob master:file2 >actual && test_cmp expect actual
133
+ git cat-file blob master:file2 >actual &&
134
+ test_cmp expect actual
135
'
136
137
echo "$file3_data" >expect
138
test_expect_success 'A: verify file3' '
138
- git cat-file blob master:file3 >actual && test_cmp expect actual
139
+ git cat-file blob master:file3 >actual &&
140
+ test_cmp expect actual
141
'
142
143
printf "$file4_data" >expect
144
test_expect_success 'A: verify file4' '
143
- git cat-file blob master:file4 >actual && test_cmp expect actual
145
+ git cat-file blob master:file4 >actual &&
146
+ test_cmp expect actual
147
'
148
149
cat >expect <<EOF
@@ -1656,10 +1659,14 @@ INPUT_END
1659
test_expect_success 'P: superproject & submodule mix' '
1660
git fast-import <input &&
1661
git checkout subuse1 &&
1659
- rm -rf sub && mkdir sub && (cd sub &&
1660
- git init &&
1661
- git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1662
- git checkout master) &&
1662
+ rm -rf sub &&
1663
+ mkdir sub &&
1664
+ (
1665
+ cd sub &&
1666
+ git init &&
1667
+ git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
1668
+ git checkout master
1669
+ ) &&
1670
git submodule init &&
1671
git submodule update
1672
'
@@ -1697,7 +1704,8 @@ INPUT_END
1704
1705
test_expect_success 'P: verbatim SHA gitlinks' '
1706
git branch -D sub &&
1700
- git gc && git prune &&
1707
+ git gc &&
1708
+ git prune &&
1709
git fast-import <input &&
1710
test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)
1711
'
@@ -1942,17 +1950,20 @@ test_expect_success 'Q: verify first notes tree' '
1950
1951
echo "$note1_data" >expect
1952
test_expect_success 'Q: verify first note for first commit' '
1945
- git cat-file blob refs/notes/foobar~2:$commit1 >actual && test_cmp expect actual
1953
+ git cat-file blob refs/notes/foobar~2:$commit1 >actual &&
1954
+ test_cmp expect actual
1955
'
1956
1957
echo "$note2_data" >expect
1958
test_expect_success 'Q: verify first note for second commit' '
1950
- git cat-file blob refs/notes/foobar~2:$commit2 >actual && test_cmp expect actual
1959
+ git cat-file blob refs/notes/foobar~2:$commit2 >actual &&
1960
+ test_cmp expect actual
1961
'
1962
1963
echo "$note3_data" >expect
1964
test_expect_success 'Q: verify first note for third commit' '
1955
- git cat-file blob refs/notes/foobar~2:$commit3 >actual && test_cmp expect actual
1965
+ git cat-file blob refs/notes/foobar~2:$commit3 >actual &&
1966
+ test_cmp expect actual
1967
'
1968
1969
cat >expect <<EOF
@@ -1980,17 +1991,20 @@ test_expect_success 'Q: verify second notes tree' '
1991
1992
echo "$note1b_data" >expect
1993
test_expect_success 'Q: verify second note for first commit' '
1983
- git cat-file blob refs/notes/foobar^:$commit1 >actual && test_cmp expect actual
1994
+ git cat-file blob refs/notes/foobar^:$commit1 >actual &&
1995
+ test_cmp expect actual
1996
'
1997
1998
echo "$note2_data" >expect
1999
test_expect_success 'Q: verify first note for second commit' '
1988
- git cat-file blob refs/notes/foobar^:$commit2 >actual && test_cmp expect actual
2000
+ git cat-file blob refs/notes/foobar^:$commit2 >actual &&
2001
+ test_cmp expect actual
2002
'
2003
2004
echo "$note3_data" >expect
2005
test_expect_success 'Q: verify first note for third commit' '
1993
- git cat-file blob refs/notes/foobar^:$commit3 >actual && test_cmp expect actual
2006
+ git cat-file blob refs/notes/foobar^:$commit3 >actual &&
2007
+ test_cmp expect actual
2008
'
2009
2010
cat >expect <<EOF
@@ -2015,7 +2029,8 @@ test_expect_success 'Q: verify third notes tree' '
2029
2030
echo "$note1c_data" >expect
2031
test_expect_success 'Q: verify third note for first commit' '
2018
- git cat-file blob refs/notes/foobar2:$commit1 >actual && test_cmp expect actual
2032
+ git cat-file blob refs/notes/foobar2:$commit1 >actual &&
2033
+ test_cmp expect actual
2034
'
2035
2036
cat >expect <<EOF
@@ -2041,7 +2056,8 @@ test_expect_success 'Q: verify fourth notes tree' '
2056
2057
echo "$note2b_data" >expect
2058
test_expect_success 'Q: verify second note for second commit' '
2044
- git cat-file blob refs/notes/foobar:$commit2 >actual && test_cmp expect actual
2059
+ git cat-file blob refs/notes/foobar:$commit2 >actual &&
2060
+ test_cmp expect actual
2061
'
2062
2063
cat >input <<EOF