Skip to content

Commit f78b1c5

Browse files
keszybzgitster
authored andcommitted
t9002: work around shells that are unable to set COLUMNS to 1
In t9002-column.sh, file with expected output was shared between two test cases, but set in the first one. Since the first test case can now be skipped, setting up the expected output is moved outside of the test case. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 077539d commit f78b1c5

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

t/t9002-column.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ EOF
5050
test_cmp expected actual
5151
'
5252

53-
test_expect_success 'COLUMNS = 1' '
54-
cat >expected <<\EOF &&
53+
cat >expected <<\EOF
5554
one
5655
two
5756
three
@@ -64,6 +63,8 @@ nine
6463
ten
6564
eleven
6665
EOF
66+
67+
test_expect_success COLUMNS_CAN_BE_1 'COLUMNS = 1' '
6768
COLUMNS=1 git column --mode=column <lista >actual &&
6869
test_cmp expected actual
6970
'

0 commit comments

Comments
 (0)