@@ -130,17 +130,20 @@ test_expect_success 'A: verify tree' '
130
130
131
131
echo " $file2_data " > expect
132
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
134
135
'
135
136
136
137
echo " $file3_data " > expect
137
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
139
141
'
140
142
141
143
printf " $file4_data " > expect
142
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
144
147
'
145
148
146
149
cat > expect << EOF
@@ -1656,10 +1659,14 @@ INPUT_END
1656
1659
test_expect_success ' P: superproject & submodule mix' '
1657
1660
git fast-import <input &&
1658
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
+ ) &&
1663
1670
git submodule init &&
1664
1671
git submodule update
1665
1672
'
@@ -1697,7 +1704,8 @@ INPUT_END
1697
1704
1698
1705
test_expect_success ' P: verbatim SHA gitlinks' '
1699
1706
git branch -D sub &&
1700
- git gc && git prune &&
1707
+ git gc &&
1708
+ git prune &&
1701
1709
git fast-import <input &&
1702
1710
test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)
1703
1711
'
@@ -1942,17 +1950,20 @@ test_expect_success 'Q: verify first notes tree' '
1942
1950
1943
1951
echo " $note1_data " > expect
1944
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
1946
1955
'
1947
1956
1948
1957
echo " $note2_data " > expect
1949
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
1951
1961
'
1952
1962
1953
1963
echo " $note3_data " > expect
1954
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
1956
1967
'
1957
1968
1958
1969
cat > expect << EOF
@@ -1980,17 +1991,20 @@ test_expect_success 'Q: verify second notes tree' '
1980
1991
1981
1992
echo " $note1b_data " > expect
1982
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
1984
1996
'
1985
1997
1986
1998
echo " $note2_data " > expect
1987
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
1989
2002
'
1990
2003
1991
2004
echo " $note3_data " > expect
1992
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
1994
2008
'
1995
2009
1996
2010
cat > expect << EOF
@@ -2015,7 +2029,8 @@ test_expect_success 'Q: verify third notes tree' '
2015
2029
2016
2030
echo " $note1c_data " > expect
2017
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
2019
2034
'
2020
2035
2021
2036
cat > expect << EOF
@@ -2041,7 +2056,8 @@ test_expect_success 'Q: verify fourth notes tree' '
2041
2056
2042
2057
echo " $note2b_data " > expect
2043
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
2045
2061
'
2046
2062
2047
2063
cat > input << EOF
0 commit comments