global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-17 06:13:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2026 from gitster/kg/external-diff-save-env

Browse Source 
diff: ensure correct lifetime of external_diff_cmd
This commit is contained in:
Johannes Schindelin
2019-01-16 10:21:16 +01:00
committed by Johannes Schindelin
parent 5fb64e5ff3 42c6914129
commit ed48192572
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
diff.c
View File

@@ -489,7 +489,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;