t7201: put each command on a separate line
Modern practice is to avoid multiple commands per line, and instead place each command on its own line. Signed-off-by: Charvi Mendiratta <charvi077@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Charvi Mendiratta committed
Oct 20, 2020 at 17:41 UTC
1c0ab5c7faa58e3c7f6926a10d3e8eb7bb143d7a
1 file changed
+18
-8
t/t7201-co.sh
+18
-8
@@ -157,7 +157,8 @@ test_expect_success 'checkout -m with merge conflict' '
157
'
158
159
test_expect_success 'format of merge conflict from checkout -m' '
160
- git checkout -f master && git clean -f &&
160
+ git checkout -f master &&
161
+ git clean -f &&
162
163
fill b d >two &&
164
git checkout -m simple &&
@@ -180,7 +181,9 @@ test_expect_success 'format of merge conflict from checkout -m' '
181
'
182
183
test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
183
- git checkout -f master && git reset --hard && git clean -f &&
184
+ git checkout -f master &&
185
+ git reset --hard &&
186
+ git clean -f &&
187
188
fill b d >two &&
189
git checkout --merge --conflict=diff3 simple &&
@@ -205,7 +208,9 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
208
'
209
210
test_expect_success 'switch to another branch while carrying a deletion' '
208
- git checkout -f master && git reset --hard && git clean -f &&
211
+ git checkout -f master &&
212
+ git reset --hard &&
213
+ git clean -f &&
214
git rm two &&
215
216
test_must_fail git checkout simple 2>errs &&
@@ -218,7 +223,8 @@ test_expect_success 'switch to another branch while carrying a deletion' '
223
test_expect_success 'checkout to detach HEAD (with advice declined)' '
224
git config advice.detachedHead false &&
225
rev=$(git rev-parse --short renamer^) &&
221
- git checkout -f renamer && git clean -f &&
226
+ git checkout -f renamer &&
227
+ git clean -f &&
228
git checkout renamer^ 2>messages &&
229
test_i18ngrep "HEAD is now at $rev" messages &&
230
test_line_count = 1 messages &&
@@ -237,7 +243,8 @@ test_expect_success 'checkout to detach HEAD (with advice declined)' '
243
test_expect_success 'checkout to detach HEAD' '
244
git config advice.detachedHead true &&
245
rev=$(git rev-parse --short renamer^) &&
240
- git checkout -f renamer && git clean -f &&
246
+ git checkout -f renamer &&
247
+ git clean -f &&
248
GIT_TEST_GETTEXT_POISON=false git checkout renamer^ 2>messages &&
249
grep "HEAD is now at $rev" messages &&
250
test_line_count -gt 1 messages &&
@@ -254,7 +261,8 @@ test_expect_success 'checkout to detach HEAD' '
261
'
262
263
test_expect_success 'checkout to detach HEAD with branchname^' '
257
- git checkout -f master && git clean -f &&
264
+ git checkout -f master &&
265
+ git clean -f &&
266
git checkout renamer^ &&
267
H=$(git rev-parse --verify HEAD) &&
268
M=$(git show-ref -s --verify refs/heads/master) &&
@@ -269,7 +277,8 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
277
'
278
279
test_expect_success 'checkout to detach HEAD with :/message' '
272
- git checkout -f master && git clean -f &&
280
+ git checkout -f master &&
281
+ git clean -f &&
282
git checkout ":/Initial" &&
283
H=$(git rev-parse --verify HEAD) &&
284
M=$(git show-ref -s --verify refs/heads/master) &&
@@ -284,7 +293,8 @@ test_expect_success 'checkout to detach HEAD with :/message' '
293
'
294
295
test_expect_success 'checkout to detach HEAD with HEAD^0' '
287
- git checkout -f master && git clean -f &&
296
+ git checkout -f master &&
297
+ git clean -f &&
298
git checkout HEAD^0 &&
299
H=$(git rev-parse --verify HEAD) &&
300
M=$(git show-ref -s --verify refs/heads/master) &&