From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Apr 2014 22:47:35 +0000 (-0700)
Subject: Merge branch 'jk/external-diff-use-argv-array' (early part)
X-Git-Tag: v2.0.0-rc2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f11a7aad0704918fde4855500caba6a3f130648;p=thirdparty%2Fgit.git

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
---

5f11a7aad0704918fde4855500caba6a3f130648