user/sven/git.git/diff.h, 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

Merge branch 'jc/diff-no-no-index'

2008-05-27T05:38:19Z

* jc/diff-no-no-index: git diff --no-index: default to page like other diff frontends git-diff: allow --no-index semantics a bit more "git diff": do not ignore index without --no-index diff-files: do not play --no-index games tests: do not use implicit "git diff --no-index"

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

"git diff": do not ignore index without --no-index

2008-05-24T07:16:39Z

Even if "foo" and/or "bar" does not exist in index, "git diff foo bar" should not change behaviour drastically from "git diff foo bar baz" or "git diff foo". A feature that "sometimes works and is handy" is an unreliable cute hack. "git diff foo bar" outside a git repository continues to work as a more colourful alternative to "diff -u" as before. Signed-off-by: Junio C Hamano

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

Provide git_config with a callback-data parameter

2008-05-14T19:34:44Z

git_config() only had a function parameter, but no callback data parameter. This assumes that all callback functions only modify global variables. With this patch, every callback gets a void * parameter, and it is hoped that this will help the libification effort. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano

diff: make "too many files" rename warning optional

2008-05-03T20:40:43Z

In many cases, the warning ends up as clutter, because the diff is being done "behind the scenes" from the user (e.g., when generating a commit diffstat), and whether we show renames or not is not particularly interesting to the user. However, in the case of a merge (which is what motivated the warning in the first place), it is a useful hint as to why a merge with renames might have failed. This patch makes the warning optional based on the code calling into diffcore. We default to not showing the warning, but turn it on for merges. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Remove dead code: show_log() sep argument and diff_options.msg_sep

2008-05-03T18:48:03Z

These variables were made unnecessary by commit 3969cf7db1a13a78f3b7a36d8c1084bbe0a53459. Signed-off-by: Adam Simpkins Signed-off-by: Junio C Hamano

Write diff output to a file in struct diff_options

2008-03-14T07:42:14Z

Signed-off-by: Daniel Barkalow Signed-off-by: Junio C Hamano