aboutsummaryrefslogtreecommitdiff
path: root/t/t4052-stat-output.sh
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2012-03-01 13:26:42 +0100
committerJunio C Hamano <gitster@pobox.com>2012-03-01 09:14:16 -0800
commit7a7159ace6c93ea6c55086dfc7ba7533a3e3c07d (patch)
treefa1dcd08622caca7841461bc7234f91d04da2c23 /t/t4052-stat-output.sh
parent5e0ec15eb131075d0c3e61b33bcc7931bbc8bc08 (diff)
downloadgit-7a7159ace6c93ea6c55086dfc7ba7533a3e3c07d.tar.gz
git-7a7159ace6c93ea6c55086dfc7ba7533a3e3c07d.tar.xz
merge --stat: use the full terminal width
Make merge --stat behave like diff --stat and use the full terminal width. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4052-stat-output.sh')
-rwxr-xr-xt/t4052-stat-output.sh8
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