зеркало из https://github.com/microsoft/git.git
Merge pull request #145 from microsoft/kg/external-diff-save-env
Fix problems with `git difftool` and a large number of files
This commit is contained in:
Коммит
97b25226d1
2
diff.c
2
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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче