mirror of
https://github.com/git/git.git
synced 2024-10-18 13:28:56 +02:00
Merge branch 'rs/difftool-env-simplify'
Code simplification. * rs/difftool-env-simplify: difftool: add env vars directly in run_file_diff()
This commit is contained in:
commit
df5c2c4962
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user