t1000-t1999: fix broken &&-chains
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Sunshine committed
Jul 1, 2018 at 20:23 UTC
f2deabfcb66fdf0fd311a28f6de6704be56b6935
6 files changed
+19
-19
t/t1004-read-tree-m-u-wf.sh
+4
-4
@@ -210,10 +210,10 @@ test_expect_success 'D/F' '
210
read_tree_u_must_succeed -m -u branch-point side-b side-a &&
211
git ls-files -u >actual &&
212
(
213
- a=$(git rev-parse branch-point:subdir/file2)
214
- b=$(git rev-parse side-a:subdir/file2/another)
215
- echo "100644 $a 1 subdir/file2"
216
- echo "100644 $a 2 subdir/file2"
213
+ a=$(git rev-parse branch-point:subdir/file2) &&
214
+ b=$(git rev-parse side-a:subdir/file2/another) &&
215
+ echo "100644 $a 1 subdir/file2" &&
216
+ echo "100644 $a 2 subdir/file2" &&
217
echo "100644 $b 3 subdir/file2/another"
218
) >expect &&
219
test_cmp expect actual
t/t1005-read-tree-reset.sh
+5
-5
@@ -33,7 +33,7 @@ test_expect_success 'reset should remove remnants from a failed merge' '
33
git ls-files -s >expect &&
34
sha1=$(git rev-parse :new) &&
35
(
36
- echo "100644 $sha1 1 old"
36
+ echo "100644 $sha1 1 old" &&
37
echo "100644 $sha1 3 old"
38
) | git update-index --index-info &&
39
>old &&
@@ -48,7 +48,7 @@ test_expect_success 'two-way reset should remove remnants too' '
48
git ls-files -s >expect &&
49
sha1=$(git rev-parse :new) &&
50
(
51
- echo "100644 $sha1 1 old"
51
+ echo "100644 $sha1 1 old" &&
52
echo "100644 $sha1 3 old"
53
) | git update-index --index-info &&
54
>old &&
@@ -63,7 +63,7 @@ test_expect_success 'Porcelain reset should remove remnants too' '
63
git ls-files -s >expect &&
64
sha1=$(git rev-parse :new) &&
65
(
66
- echo "100644 $sha1 1 old"
66
+ echo "100644 $sha1 1 old" &&
67
echo "100644 $sha1 3 old"
68
) | git update-index --index-info &&
69
>old &&
@@ -78,7 +78,7 @@ test_expect_success 'Porcelain checkout -f should remove remnants too' '
78
git ls-files -s >expect &&
79
sha1=$(git rev-parse :new) &&
80
(
81
- echo "100644 $sha1 1 old"
81
+ echo "100644 $sha1 1 old" &&
82
echo "100644 $sha1 3 old"
83
) | git update-index --index-info &&
84
>old &&
@@ -93,7 +93,7 @@ test_expect_success 'Porcelain checkout -f HEAD should remove remnants too' '
93
git ls-files -s >expect &&
94
sha1=$(git rev-parse :new) &&
95
(
96
- echo "100644 $sha1 1 old"
96
+ echo "100644 $sha1 1 old" &&
97
echo "100644 $sha1 3 old"
98
) | git update-index --index-info &&
99
>old &&
t/t1020-subdirectory.sh
+1
-1
@@ -148,7 +148,7 @@ test_expect_success 'GIT_PREFIX for built-ins' '
148
(
149
cd dir &&
150
echo "change" >two &&
151
- GIT_EXTERNAL_DIFF=./diff git diff >../actual
151
+ GIT_EXTERNAL_DIFF=./diff git diff >../actual &&
152
git checkout -- two
153
) &&
154
test_cmp expect actual
t/t1050-large.sh
+3
-3
@@ -108,7 +108,7 @@ test_expect_success 'packsize limit' '
108
test-tool genrandom "c" $(( 128 * 1024 )) >mid3 &&
109
git add mid1 mid2 mid3 &&
110
111
- count=0
111
+ count=0 &&
112
for pi in .git/objects/pack/pack-*.idx
113
do
114
test -f "$pi" && count=$(( $count + 1 ))
@@ -116,8 +116,8 @@ test_expect_success 'packsize limit' '
116
test $count = 2 &&
117
118
(
119
- git hash-object --stdin <mid1
120
- git hash-object --stdin <mid2
119
+ git hash-object --stdin <mid1 &&
120
+ git hash-object --stdin <mid2 &&
121
git hash-object --stdin <mid3
122
) |
123
sort >expect &&
t/t1411-reflog-show.sh
+3
-3
@@ -159,9 +159,9 @@ test_expect_success 'git log -g -p shows diffs vs. parents' '
159
git log -1 -p HEAD^ >log.one &&
160
git log -1 -p HEAD >log.two &&
161
(
162
- cat log.one; echo
163
- cat log.two; echo
164
- cat log.one; echo
162
+ cat log.one && echo &&
163
+ cat log.two && echo &&
164
+ cat log.one && echo &&
165
cat log.two
166
) >expect &&
167
test_cmp expect actual
t/t1512-rev-parse-disambiguation.sh
+3
-3
@@ -34,8 +34,8 @@ test_expect_success 'blob and tree' '
34
for i in 0 1 2 3 4 5 6 7 8 9
35
do
36
echo $i
37
- done
38
- echo
37
+ done &&
38
+ echo &&
39
echo b1rwzyc3
40
) >a0blgqsjc &&
41
@@ -222,7 +222,7 @@ test_expect_success 'more history' '
222
223
test_might_fail git rm -f a0blgqsjc &&
224
(
225
- git cat-file blob $side:f5518nwu
225
+ git cat-file blob $side:f5518nwu &&
226
echo j3l0i9s6
227
) >ab2gs879 &&
228
git add ab2gs879 &&