From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 3 Jun 2014 19:06:42 +0000 (-0700)
Subject: Merge branch 'jk/external-diff-use-argv-array'
X-Git-Tag: v2.1.0-rc0~195
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6779e43b0dbcaeea84319165b1f7c7480e2fe516;p=thirdparty%2Fgit.git

Merge branch 'jk/external-diff-use-argv-array'

Code clean-up (and a bugfix which has been merged for 2.0).

* jk/external-diff-use-argv-array:
  run_external_diff: refactor cmdline setup logic
  run_external_diff: hoist common bits out of conditional
  run_external_diff: drop fflush(NULL)
  run_external_diff: clean up error handling
  run_external_diff: use an argv_array for the environment
---

6779e43b0dbcaeea84319165b1f7c7480e2fe516