git/diff.c, branch v1.7.11

Merge branch 'as/diff-shortstat-ignore-binary'

2012-06-15T22:00:53Z

# By Alexander Strasser * as/diff-shortstat-ignore-binary: diff: Only count lines in show_shortstats

diff: Only count lines in show_shortstats

2012-06-15T22:00:04Z

Do not mix byte and line counts. Binary files have byte counts; skip them when accumulating line insertions/deletions. The regression was introduced in e18872b. Signed-off-by: Alexander Strasser Signed-off-by: Junio C Hamano

Merge branch 'zj/diff-empty-chmod'

2012-05-07T20:29:08Z

"git diff --stat" used to fully count a binary file with modified execution bits whose contents is unmodified, which was not right. By Zbigniew Jędrzejewski-Szmek (4) and Johannes Sixt (1) * zj/diff-empty-chmod: t4006: Windows do not have /dev/zero diff --stat: do not run diff on indentical files diff --stat: report mode-only changes for binary files like text files tests: check --[short]stat output after chmod test: modernize style of t4006 Conflicts: diff.c

Merge branch 'zj/diff-stat-smaller-num-columns'

2012-05-02T20:53:28Z

Spend only minimum number of columns necessary to show the number of lines in the output from "diff --stat", instead of always allocating 4 columns even when showing changes that are much smaller than 1000 lines. By Zbigniew Jędrzejewski-Szmek * zj/diff-stat-smaller-num-columns: diff --stat: use less columns for change counts

Merge branch 'lp/diffstat-with-graph'

2012-05-02T20:51:59Z

"log --graph" was not very friendly with "--stat" option and its output had line breaks at wrong places. By Lucian Poston (5) and Zbigniew Jędrzejewski-Szmek (2) * lp/diffstat-with-graph: t4052: work around shells unable to set COLUMNS to 1 Prevent graph_width of stat width from falling below min t4052: Test diff-stat output with minimum columns t4052: Adjust --graph --stat output for prefixes Adjust stat width calculations to take --graph output into account Add output_prefix_length to diff_options t4052: test --stat output with --graph

diff --stat: do not run diff on indentical files

2012-05-02T04:29:03Z

If two objects are known to be equal, there is no point running the diff. Signed-off-by: Zbigniew Jędrzejewski-Szmek Signed-off-by: Junio C Hamano

diff --stat: report mode-only changes for binary files like text files

2012-05-02T04:26:46Z

Mode-only changes to binary files without content change were reported as if they were rewritten, but text files in the same situation were reported as "unchanged". Let's treat binary files like text files here, and simply say that they are unchanged. Output of --shortstat is modified in the same way. Reported-by: Martin Mareš Signed-off-by: Zbigniew Jędrzejewski-Szmek Signed-off-by: Junio C Hamano

diff --stat: use less columns for change counts

2012-04-30T21:17:26Z

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 Signed-off-by: Junio C Hamano

Merge branch 'lp/maint-diff-three-dash-with-graph'

2012-04-23T19:57:21Z

"log -p --graph" used with "--stat" had a few formatting error. By Lucian Poston * lp/maint-diff-three-dash-with-graph: t4202: add test for "log --graph --stat -p" separator lines log --graph: fix break in graph lines log --graph --stat: three-dash separator should come after graph lines

Prevent graph_width of stat width from falling below min

2012-04-18T23:08:11Z

Update tests in t4052 fixed by this change. Signed-off-by: Lucian Poston Signed-off-by: Junio C Hamano