Merge branch 'jk/external-diff-use-argv-array' (early part)
commit5f11a7aad0704918fde4855500caba6a3f130648
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Apr 2014 22:47:35 +0000 (28 15:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Apr 2014 22:47:35 +0000 (28 15:47 -0700)
tree56072ffdd9cd2f85a7e46b4177ef675cf3782606
parent35936f8fc38a214cc7d2595070641d39a541dfb1
parent82fbf269b9994d172719b2d456db5ef8453b323d
Merge branch 'jk/external-diff-use-argv-array' (early part)

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
diff.c