Skip to content

Commit 6d504d5

Browse files
Denton-Lgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent af6b65d commit 6d504d5

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

t/t3200-branch.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -323,11 +323,11 @@ test_expect_success 'git branch --list -v with --abbrev' '
323323

324324
test_expect_success 'git branch --column' '
325325
COLUMNS=81 git branch --column=column >actual &&
326-
cat >expected <<\EOF &&
326+
cat >expect <<\EOF &&
327327
a/b/c bam foo l * master mb o/o q
328328
abc bar j/k m/m master2 n o/p r
329329
EOF
330-
test_cmp expected actual
330+
test_cmp expect actual
331331
'
332332

333333
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' '
336336
test_when_finished "git branch -d $long" &&
337337
git branch $long &&
338338
COLUMNS=80 git branch --column=column >actual &&
339-
cat >expected <<EOF &&
339+
cat >expect <<EOF &&
340340
a/b/c
341341
abc
342342
bam
@@ -355,7 +355,7 @@ test_expect_success 'git branch --column with an extremely long branch name' '
355355
r
356356
$long
357357
EOF
358-
test_cmp expected actual
358+
test_cmp expect actual
359359
'
360360

361361
test_expect_success 'git branch with column.*' '
@@ -364,11 +364,11 @@ test_expect_success 'git branch with column.*' '
364364
COLUMNS=80 git branch >actual &&
365365
git config --unset column.branch &&
366366
git config --unset column.ui &&
367-
cat >expected <<\EOF &&
367+
cat >expect <<\EOF &&
368368
a/b/c bam foo l * master mb o/o q
369369
abc bar j/k m/m master2 n o/p r
370370
EOF
371-
test_cmp expected actual
371+
test_cmp expect actual
372372
'
373373

374374
test_expect_success 'git branch --column -v should fail' '
@@ -379,7 +379,7 @@ test_expect_success 'git branch -v with column.ui ignored' '
379379
git config column.ui column &&
380380
COLUMNS=80 git branch -v | cut -c -10 | sed "s/ *$//" >actual &&
381381
git config --unset column.ui &&
382-
cat >expected <<\EOF &&
382+
cat >expect <<\EOF &&
383383
a/b/c
384384
abc
385385
bam
@@ -397,7 +397,7 @@ test_expect_success 'git branch -v with column.ui ignored' '
397397
q
398398
r
399399
EOF
400-
test_cmp expected actual
400+
test_cmp expect actual
401401
'
402402

403403
mv .git/config .git/config-saved
@@ -922,17 +922,17 @@ test_expect_success 'test --unset-upstream on a particular branch' '
922922
'
923923

924924
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
926926
'
927927

928928
test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
929929
git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
930-
cat >expected <<-\EOF &&
930+
cat >expect <<-\EOF &&
931931
warning: Not setting branch my13 as its own upstream.
932932
EOF
933933
test_expect_code 1 git config branch.my13.remote &&
934934
test_expect_code 1 git config branch.my13.merge &&
935-
test_i18ncmp expected actual
935+
test_i18ncmp expect actual
936936
'
937937

938938
# Keep this test last, as it changes the current branch

0 commit comments

Comments
 (0)