diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-01-29 20:47:51 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-01-29 20:47:52 (GMT) |
commit | 6a015cecbe662b00c8ac697b95d966def569f4e7 (patch) | |
tree | 7dd372307992ca578cbc9ae9e8847f2c0ec563aa /diff.c | |
parent | 16a465bc018d09e9d7bbbdc5f40a7fb99c21f8ef (diff) | |
parent | 6776a84dae701723721e2ff050acc57d63eeb59c (diff) | |
download | git-6a015cecbe662b00c8ac697b95d966def569f4e7.zip git-6a015cecbe662b00c8ac697b95d966def569f4e7.tar.gz git-6a015cecbe662b00c8ac697b95d966def569f4e7.tar.bz2 |
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
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -493,7 +493,7 @@ static const char *external_diff(void) if (done_preparing) return external_diff_cmd; - external_diff_cmd = getenv("GIT_EXTERNAL_DIFF"); + external_diff_cmd = xstrdup_or_null(getenv("GIT_EXTERNAL_DIFF")); if (!external_diff_cmd) external_diff_cmd = external_diff_cmd_cfg; done_preparing = 1; |