]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/external-diff-use-argv-array' (early part)
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Apr 2014 22:47:35 +0000 (15:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Apr 2014 22:47:35 +0000 (15:47 -0700)
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

1  2 
diff.c

diff --cc diff.c
Simple merge