From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 29 Jan 2019 20:47:51 +0000 (-0800)
Subject: Merge branch 'kg/external-diff-save-env'
X-Git-Tag: v2.21.0-rc0~75
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6a015cecbe662b00c8ac697b95d966def569f4e7;p=thirdparty%2Fgit.git

Merge branch 'kg/external-diff-save-env'

The code to drive GIT_EXTERNAL_DIFF command relied on the string
returned from getenv() to be non-volatile, which is not true, that
has been corrected.

* kg/external-diff-save-env:
  diff: ensure correct lifetime of external_diff_cmd
---

6a015cecbe662b00c8ac697b95d966def569f4e7