Merge branch 'kg/external-diff-save-env'
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Jan 2019 20:47:51 +0000 (12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jan 2019 20:47:52 +0000 (12:47 -0800)
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

1  2 
diff.c
diff --cc diff.c
Simple merge