git/t/t4013/diff.diff-tree_--cc_--patch-with-stat_master

$ git diff-tree --cc --patch-with-stat master
59d314ad6f356dd08601a4cd5e530381da3e3c64
 dir/sub | 2 ++
 file0   | 3 +++
 2 files changed, 5 insertions(+)

diff --cc dir/sub
index cead32e,7289e35..992913c
--- a/dir/sub
+++ b/dir/sub
@@@ -1,6 -1,4 +1,8 @@@
  A
  B
 +C
 +D
 +E
 +F
+ 1
+ 2
diff --cc file0
index b414108,f4615da..10a8a9f
--- a/file0
+++ b/file0
@@@ -1,6 -1,6 +1,9 @@@
  1
  2
  3
 +4
 +5
 +6
+ A
+ B
+ C
$
t4013: note improvements brought by the new output code. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-30 03:00:12 +08:00			`$ git diff-tree --cc --patch-with-stat master`
t4013 diff format tests update This changes one test commit in the sequence to have more than one lines of commit log. A few output formats (--pretty=email aka format-patch and --pretty=oneline) need to behave differently on single and multi-line log, and this change will help catching breakages. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-07-14 10:51:12 +08:00			`59d314ad6f356dd08601a4cd5e530381da3e3c64`
diff --stat: use less columns for change counts 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> 2012-05-01 04:38:58 +08:00			`dir/sub \| 2 ++`
			`file0 \| 3 +++`
Use correct grammar in diffstat summary line "git diff --stat" and "git apply --stat" now learn to print the line "%d files changed, %d insertions(+), %d deletions(-)" in singular form whenever applicable. "0 insertions" and "0 deletions" are also omitted unless they are both zero. This matches how versions of "diffstat" that are not prehistoric produced their output, and also makes this line translatable. [jc: with help from Thomas Dickey in archaeology of "diffstat"] [jc: squashed Jonathan's updates to illustrations in tutorials and a test] Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2012-02-01 20:55:07 +08:00			`2 files changed, 5 insertions(+)`
t4013: note improvements brought by the new output code. Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-30 03:00:12 +08:00
			`diff --cc dir/sub`
			`index cead32e,7289e35..992913c`
			`--- a/dir/sub`
			`+++ b/dir/sub`
			`@@@ -1,6 -1,4 +1,8 @@@`
			`A`
			`B`
			`+C`
			`+D`
			`+E`
			`+F`
			`+ 1`
			`+ 2`
			`diff --cc file0`
			`index b414108,f4615da..10a8a9f`
			`--- a/file0`
			`+++ b/file0`
			`@@@ -1,6 -1,6 +1,9 @@@`
			`1`
			`2`
			`3`
			`+4`
			`+5`
			`+6`
			`+ A`
			`+ B`
			`+ C`
			`$`