delta/git.git/diff.c, branch so/rebase-doc

Merge branch 'bg/xcalloc-nmemb-then-size' into maint

2014-07-22T17:25:17+00:00

* bg/xcalloc-nmemb-then-size:
  transport-helper.c: rearrange xcalloc arguments
  remote.c: rearrange xcalloc arguments
  reflog-walk.c: rearrange xcalloc arguments
  pack-revindex.c: rearrange xcalloc arguments
  notes.c: rearrange xcalloc arguments
  imap-send.c: rearrange xcalloc arguments
  http-push.c: rearrange xcalloc arguments
  diff.c: rearrange xcalloc arguments
  config.c: rearrange xcalloc arguments
  commit.c: rearrange xcalloc arguments
  builtin/remote.c: rearrange xcalloc arguments
  builtin/ls-remote.c: rearrange xcalloc arguments

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

2014-06-25T18:47:23+00:00

"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

diff.c: rearrange xcalloc arguments

2014-05-27T21:02:03+00:00

xcalloc() takes two arguments: the number of elements and their size.
diffstat_add() passes the arguments in reverse order, passing the
size of a diffstat_file*, followed by the number of diffstat_file* to
be allocated.

Rearrange them so they are in the correct order.

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

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

2014-05-20T18:09:03+00:00

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:35+00:00

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:50+00:00

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:56+00:00

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:28+00:00

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:27+00:00

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:41+00:00

"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