kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'rs/difftool-env-simplify' into maint-2.45 

Code simplification.

* rs/difftool-env-simplify:
  difftool: add env vars directly in run_file_diff()
maint
Junio C Hamano 2024-06-28 15:53:16 -07:00
parent 6e3eb346ed 36d900d2b0
commit 7b7db54b83
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 @@ finish:
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);
}