git/diff.c, branch v2.0.2

Merge branch 'jk/diff-follow-must-take-one-pathspec' into maint

2014-06-25T18:47:23Z

"git format-patch" did not enforce the rule that the "--follow" option from the log/diff family of commands must be used with exactly one pathspec. * jk/diff-follow-must-take-one-pathspec: move "--follow needs one pathspec" rule to diff_setup_done

move "--follow needs one pathspec" rule to diff_setup_done

2014-05-20T18:09:03Z

Because of the way "--follow" is implemented, we must have exactly one pathspec. "git log" enforces this restriction, but other users of the revision traversal code do not. For example, "git format-patch --follow" will segfault during try_to_follow_renames, as we have no pathspecs at all. We can push this check down into diff_setup_done, which is probably a better place anyway. It is the diff code that introduces this restriction, so other parts of the code should not need to care themselves. Reported-by: "Michael S. Tsirkin" Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'jk/external-diff-use-argv-array' (early part)

2014-04-28T22:47:35Z

Crash fix for codepath that miscounted the necessary size for an array when spawning an external diff program. * 'jk/external-diff-use-argv-array' (early part): run_external_diff: use an argv_array for the command line

run_external_diff: use an argv_array for the command line

2014-04-21T17:29:50Z

We currently generate the command-line for the external command using a fixed-length array of size 10. But if there is a rename, we actually need 11 elements (10 items, plus a NULL), and end up writing a random NULL onto the stack. Rather than bump the limit, let's just use an argv_array, which makes this sort of error impossible. Noticed-by: Max L Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

i18n: remove obsolete comments for translators in diffstat generation

2014-04-17T18:09:56Z

Since we do not translate diffstat any more, remove the obsolete comments. Signed-off-by: Jiang Xin Signed-off-by: Junio C Hamano

Merge branch 'jl/nor-or-nand-and'

2014-04-08T19:00:28Z

Eradicate mistaken use of "nor" (that is, essentially "nor" used not in "neither A nor B" ;-)) from in-code comments, command output strings, and documentations. * jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor"

comments: fix misuses of "nor"

2014-03-31T22:29:27Z

Signed-off-by: Justin Lebar Signed-off-by: Junio C Hamano

Merge branch 'tr/diff-submodule-no-reuse-worktree' into maint

2014-03-18T21:03:41Z

"git diff --external-diff" incorrectly fed the submodule directory in the working tree to the external diff driver when it knew it is the same as one of the versions being compared. * tr/diff-submodule-no-reuse-worktree: diff: do not reuse_worktree_file for submodules

Merge branch 'nd/diff-quiet-stat-dirty' into maint

2014-03-18T20:59:56Z

"git diff --quiet -- pathspec1 pathspec2" sometimes did not return correct status value. * nd/diff-quiet-stat-dirty: diff: do not quit early on stat-dirty files diff.c: move diffcore_skip_stat_unmatch core logic out for reuse later

Merge branch 'rm/strchrnul-not-strlen'

2014-03-18T20:51:18Z

* rm/strchrnul-not-strlen: use strchrnul() in place of strchr() and strlen()