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>
Zbigniew Jędrzejewski-Szmek committed
Mar 1, 2012 at 13:26 UTC
7a7159ace6c93ea6c55086dfc7ba7533a3e3c07d
2 files changed
+5
-4
builtin/merge.c
+1
@@ -399,6 +399,7 @@ static void finish(struct commit *head_commit,
399
if (new_head && show_diffstat) {
400
struct diff_options opts;
401
diff_setup(&opts);
402
+ opts.stat_width = -1; /* use full terminal width */
403
opts.output_format |=
404
DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
405
opts.detect_rename = DIFF_DETECT_RENAME;
t/t4052-stat-output.sh
+4
-4
@@ -168,9 +168,9 @@ respects expect200 log -1 --stat
168
EOF
169
170
cat >expect <<'EOF'
171
- abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
171
+ abcd | 1000 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
172
EOF
173
-test_expect_success 'merge --stat ignores COLUMNS (big change)' '
173
+test_expect_success 'merge --stat respects COLUMNS (big change)' '
174
git checkout -b branch HEAD^^ &&
175
COLUMNS=100 git merge --stat --no-ff master^ >output &&
176
grep " | " output >actual
@@ -178,9 +178,9 @@ test_expect_success 'merge --stat ignores COLUMNS (big change)' '
178
'
179
180
cat >expect <<'EOF'
181
- ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++++++++++
181
+ ...aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 ++++++++++++++++++++++++++++++++++++++++
182
EOF
183
-test_expect_success 'merge --stat ignores COLUMNS (long filename)' '
183
+test_expect_success 'merge --stat respects COLUMNS (long filename)' '
184
COLUMNS=100 git merge --stat --no-ff master >output &&
185
grep " | " output >actual
186
test_cmp expect actual