diff options
Diffstat (limited to 't/t4052-stat-output.sh')
| -rwxr-xr-x | t/t4052-stat-output.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh index f81d427db..954c16f0a 100755 --- a/t/t4052-stat-output.sh +++ b/t/t4052-stat-output.sh @@ -168,9 +168,9 @@ respects expect200 log -1 --stat EOF cat >expect <<'EOF' - abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ EOF -test_expect_success 'merge --stat ignores COLUMNS (big change)' ' +test_expect_success 'merge --stat respects COLUMNS (big change)' ' git checkout -b branch HEAD^^ && COLUMNS=100 git merge --stat --no-ff master^ >output && grep " | " output >actual @@ -178,9 +178,9 @@ test_expect_success 'merge --stat ignores COLUMNS (big change)' ' ' cat >expect <<'EOF' - ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++++++++++ + ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++++++++++++++++++++++++++++++ EOF -test_expect_success 'merge --stat ignores COLUMNS (long filename)' ' +test_expect_success 'merge --stat respects COLUMNS (long filename)' ' COLUMNS=100 git merge --stat --no-ff master >output && grep " | " output >actual test_cmp expect actual |