development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-06-30 22:54:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'rs/difftool-env-simplify'

Browse Source 
Code simplification.

* rs/difftool-env-simplify:
  difftool: add env vars directly in run_file_diff()
This commit is contained in:
Junio C Hamano 2024-06-06 12:49:24 -07:00
commit df5c2c4962
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
builtin/difftool.c
View File

@ -674,19 +674,15 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
static int run_file_diff(int prompt, const char *prefix,
struct child_process *child)
{
const char *env[] = {
"GIT_PAGER=", "GIT_EXTERNAL_DIFF=git-difftool--helper", NULL,
NULL
};
strvec_push(&child->env, "GIT_PAGER=");
strvec_push(&child->env, "GIT_EXTERNAL_DIFF=git-difftool--helper");
if (prompt > 0)
env[2] = "GIT_DIFFTOOL_PROMPT=true";
strvec_push(&child->env, "GIT_DIFFTOOL_PROMPT=true");
else if (!prompt)
env[2] = "GIT_DIFFTOOL_NO_PROMPT=true";
strvec_push(&child->env, "GIT_DIFFTOOL_NO_PROMPT=true");
child->git_cmd = 1;
child->dir = prefix;
strvec_pushv(&child->env, env);
return run_command(child);
}