mirror of
https://github.com/git/git.git
synced 2024-11-18 06:54:55 +01:00
dc801e71a7
Number of columns required for change counts is now computed based on the maximum number of changed lines instead of being fixed. This means that usually a few more columns will be available for the filenames and the graph. The graph width logic is also modified to include enough space for "Bin XXX -> YYY bytes". If changes to binary files are mixed with changes to text files, change counts are padded to take at least three columns. And the other way around, if change counts require more than three columns, then "Bin"s are padded to align with the change count. This way, the +- part starts in the same column as "XXX -> YYY" part for binary files. This makes the graph easier to parse visually thanks to the empty column. This mimics the layout of diff --stat before this change. Tests and the tutorial are updated to reflect the new --stat output. This means either the removal of extra padding and/or the addition of up to three extra characters to truncated filenames. One test is added to check the graph alignment when a binary file change and text file change of more than 999 lines are committed together. Signed-off-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
44 lines
773 B
Bash
Executable file
44 lines
773 B
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='Test am with auto.crlf'
|
|
|
|
. ./test-lib.sh
|
|
|
|
cat >patchfile <<\EOF
|
|
From 38be10072e45dd6b08ce40851e3fca60a31a340b Mon Sep 17 00:00:00 2001
|
|
From: Marius Storm-Olsen <x@y.com>
|
|
Date: Thu, 23 Aug 2007 13:00:00 +0200
|
|
Subject: test1
|
|
|
|
---
|
|
foo | 1 +
|
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
|
create mode 100644 foo
|
|
|
|
diff --git a/foo b/foo
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..5716ca5987cbf97d6bb54920bea6adde242d87e6
|
|
--- /dev/null
|
|
+++ b/foo
|
|
@@ -0,0 +1 @@
|
|
+bar
|
|
EOF
|
|
|
|
test_expect_success 'setup' '
|
|
|
|
git config core.autocrlf true &&
|
|
echo foo >bar &&
|
|
git add bar &&
|
|
test_tick &&
|
|
git commit -m initial
|
|
|
|
'
|
|
|
|
test_expect_success 'am' '
|
|
|
|
git am -3 <patchfile &&
|
|
git diff-files --name-status --exit-code
|
|
|
|
'
|
|
|
|
test_done
|