user/sven/git.git/diff.c, branch v1.4.4.4

diff --check: fix off by one error

2006-12-22T04:31:14Z

When parsing the diff line starting with '@@', the line number of the '+' file is parsed. For the subsequent line parses, the line number should therefore be incremented after the parse, not before it. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'js/diff'

2006-10-19T05:09:03Z

* js/diff: Turn on recursive with --summary

diff --numstat

2006-10-14T04:37:10Z

[jc: with documentation from Jakub] Signed-off-by: Junio C Hamano

Turn on recursive with --summary

2006-10-05T22:10:40Z

This makes "git log/diff --summary" imply recursive behaviour, whose effect is summarized in one test output: --- a/t/t4013/diff.diff-tree_--pretty_--root_--summary_initial +++ b/t/t4013/diff.diff-tree_--pretty_--root_--summary_initial @@ -5,7 +5,7 @@ Date: Mon Jun 26 00:00:00 2006 +0000 Initial - create mode 040000 dir + create mode 100644 dir/sub create mode 100644 file0 create mode 100644 file2 $ When a file is created in a subdirectory, we used to say just the directory name only when that directory also was created, which did not make sense from two reasons. It is not any more significant to create a new file in a new directory than to create a new file in an existing directory, and even if it were, reportinging the new directory name without saying the actual filename is not useful. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'jc/diff-stat'

2006-10-01T04:29:18Z

* jc/diff-stat: diff --stat: ensure at least one '-' for deletions, and one '+' for additions diff --stat=width[,name-width]: allow custom diffstat output width. diff --stat: color output. diff --stat: allow custom diffstat output width.

git-diff -B output fix.

2006-09-29T09:06:24Z

Geert noticed that complete rewrite diff missed the usual a/ and b/ leading paths. Pickaxe says it never worked, ever. Embarrassing. Signed-off-by: Junio C Hamano

diff --stat: ensure at least one '-' for deletions, and one '+' for additions

2006-09-29T05:32:53Z

The number of '-' and '+' is still linear. The idea is that scaled-length := floor(a * length + b) with the following constraints: if length == 1, scaled-length == 1, and the combined length of plusses and minusses should not be larger than the width by a small margin. Thus, a + b == 1 and a * max_plusses + b + a * max_minusses + b = width + 1 The solution is a * x + b = ((width - 1) * (x - 1) + max_change - 1) / (max_change - 1) Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

diff --stat=width[,name-width]: allow custom diffstat output width.

2006-09-29T05:27:29Z

Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

diff --stat: color output.

2006-09-27T09:57:37Z

Under --color option, diffstat shows '+' and '-' in the graph the same color as added and deleted lines. Signed-off-by: Junio C Hamano

diff --stat: allow custom diffstat output width.

2006-09-27T09:55:08Z

This adds two parameters to "diff --stat". . --stat-width=72 tells that the page should fit on 72-column output. . --stat-name-width=30 tells that the filename part is limited to 30 columns. Signed-off-by: Junio C Hamano