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

diff: ensure correct lifetime of external_diff_cmd
git-for-windows · Jan 16, 2019 · 4d3be1d · 4d3be1d
2 parents 6b28658 + 6776a84
commit 4d3be1d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/diff.c b/diff.c
@@ -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;