t3200: rename "expected" to "expect"
Clean up style of test by changing some filenames from "expected" to "expect", which follows typical test convention. Also, change a space-indent into a tab-indent. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Jun 15, 2020 at 07:53 UTC
6d504d5b0f6cf5eff454fd070c05ca3f014fc8fa
1 file changed
+11
-11
t/t3200-branch.sh
+11
-11
@@ -323,11 +323,11 @@ test_expect_success 'git branch --list -v with --abbrev' '
323
324
test_expect_success 'git branch --column' '
325
COLUMNS=81 git branch --column=column >actual &&
326
- cat >expected <<\EOF &&
326
+ cat >expect <<\EOF &&
327
a/b/c bam foo l * master mb o/o q
328
abc bar j/k m/m master2 n o/p r
329
EOF
330
- test_cmp expected actual
330
+ test_cmp expect actual
331
'
332
333
test_expect_success 'git branch --column with an extremely long branch name' '
@@ -336,7 +336,7 @@ test_expect_success 'git branch --column with an extremely long branch name' '
336
test_when_finished "git branch -d $long" &&
337
git branch $long &&
338
COLUMNS=80 git branch --column=column >actual &&
339
- cat >expected <<EOF &&
339
+ cat >expect <<EOF &&
340
a/b/c
341
abc
342
bam
@@ -355,7 +355,7 @@ test_expect_success 'git branch --column with an extremely long branch name' '
355
r
356
$long
357
EOF
358
- test_cmp expected actual
358
+ test_cmp expect actual
359
'
360
361
test_expect_success 'git branch with column.*' '
@@ -364,11 +364,11 @@ test_expect_success 'git branch with column.*' '
364
COLUMNS=80 git branch >actual &&
365
git config --unset column.branch &&
366
git config --unset column.ui &&
367
- cat >expected <<\EOF &&
367
+ cat >expect <<\EOF &&
368
a/b/c bam foo l * master mb o/o q
369
abc bar j/k m/m master2 n o/p r
370
EOF
371
- test_cmp expected actual
371
+ test_cmp expect actual
372
'
373
374
test_expect_success 'git branch --column -v should fail' '
@@ -379,7 +379,7 @@ test_expect_success 'git branch -v with column.ui ignored' '
379
git config column.ui column &&
380
COLUMNS=80 git branch -v | cut -c -10 | sed "s/ *$//" >actual &&
381
git config --unset column.ui &&
382
- cat >expected <<\EOF &&
382
+ cat >expect <<\EOF &&
383
a/b/c
384
abc
385
bam
@@ -397,7 +397,7 @@ test_expect_success 'git branch -v with column.ui ignored' '
397
q
398
r
399
EOF
400
- test_cmp expected actual
400
+ test_cmp expect actual
401
'
402
403
mv .git/config .git/config-saved
@@ -922,17 +922,17 @@ test_expect_success 'test --unset-upstream on a particular branch' '
922
'
923
924
test_expect_success 'disabled option --set-upstream fails' '
925
- test_must_fail git branch --set-upstream origin/master
925
+ test_must_fail git branch --set-upstream origin/master
926
'
927
928
test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
929
git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
930
- cat >expected <<-\EOF &&
930
+ cat >expect <<-\EOF &&
931
warning: Not setting branch my13 as its own upstream.
932
EOF
933
test_expect_code 1 git config branch.my13.remote &&
934
test_expect_code 1 git config branch.my13.merge &&
935
- test_i18ncmp expected actual
935
+ test_i18ncmp expect actual
936
'
937
938
# Keep this test last, as it changes the current branch