]> git.ipfire.org Git - thirdparty/git.git/commit
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)
commit6a015cecbe662b00c8ac697b95d966def569f4e7
tree7dd372307992ca578cbc9ae9e8847f2c0ec563aa
parent16a465bc018d09e9d7bbbdc5f40a7fb99c21f8ef
parent6776a84dae701723721e2ff050acc57d63eeb59c
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
diff.c