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

Fix buffer overflow in git diff

2008-07-16T21:03:24Z

If PATH_MAX on your system is smaller than a path stored, it may cause buffer overflow and stack corruption in diff_addremove() and diff_change() functions when running git-diff Signed-off-by: Dmitry Potapov Signed-off-by: Junio C Hamano

diff.c: Use 'git_config_string' to get 'diff.external'

2008-07-06T00:42:34Z

Signed-off-by: Brian Hetro Signed-off-by: Junio C Hamano

diff --check: do not discard error status upon seeing a good line

2008-06-26T20:26:25Z

"git diff --check" should return non-zero when there was any whitespace error but the code only paid attention to the error status of the last new line in the patch. Signed-off-by: Junio C Hamano

Merge branch 'maint'

2008-06-17T00:39:50Z

* maint: diff.c: fix emit_line() again not to add extra line

diff.c: fix emit_line() again not to add extra line

2008-06-17T00:37:21Z

Signed-off-by: Junio C Hamano

Merge branch 'maint'

2008-06-16T23:14:22Z

* maint: diff: reset color before printing newline

diff: reset color before printing newline

2008-06-16T22:22:09Z

It worked that way since commit 50f575fc (Tweak diff colors, 2006-06-22), but commit c1795bb0 (Unify whitespace checking, 2007-12-13) changed it. This patch restores the old behaviour. Besides Linus' arguments in the log message of 50f575fc, resetting color before printing newline is also important to keep 'git add --patch' happy. If the last line(s) of a file are removed, then that hunk will end with a colored line. However, if the newline comes before the color reset, then the diff output will have an additional line at the end containing only the reset sequence. This causes trouble in git-add--interactive.perl's parse_diff function, because @colored will have one more element than @diff, and that last element will contain the color reset. The elements of these arrays will then be copied to @hunk, but only as many as the number of elements in @diff. As a result the last color reset is lost and all subsequent terminal output will be printed in color. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

Merge branch 'js/config-cb'

2008-05-25T21:25:02Z

* js/config-cb: Provide git_config with a callback-data parameter Conflicts: builtin-add.c builtin-cat-file.c

diff options: Introduce --ignore-submodules

2008-05-15T23:12:40Z

The new option --ignore-submodules can now be used to ignore changes in submodules. Why? Sometimes it is not interesting when a submodule changed. For example, when reordering some commits in the superproject, a dirty submodule is usually totally uninteresting. So we will use this option in git-rebase to test for a dirty working tree. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'jk/renamelimit' (early part)

2008-05-14T19:37:28Z

* 'jk/renamelimit' (early part): diff: make "too many files" rename warning optional bump rename limit defaults add merge.renamelimit config option