difftool: use run_command() API in run_file_diff()
Change the run_file_diff() function to use the run_command() API directly, instead of invoking the run_command_v_opt_cd_env() wrapper. This allows it, like run_dir_diff(), to use the "args" from "struct strvec", instead of the "const char **argv" passed into cmd_difftool(). This will be used in the subsequent commit to get rid of OPT_ARGUMENT() from cmd_difftool(). Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Sep 13, 2021 at 05:35 UTC
cc5b594788c3fc89ab5e84de2d657ddf36409821
1 file changed
+6
-7
builtin/difftool.c
+6
-7
@@ -663,24 +663,23 @@ finish:
663
}
664
665
static int run_file_diff(int prompt, const char *prefix,
666
- int argc, const char **argv)
666
+ struct child_process *child)
667
{
668
- struct strvec args = STRVEC_INIT;
668
const char *env[] = {
669
"GIT_PAGER=", "GIT_EXTERNAL_DIFF=git-difftool--helper", NULL,
670
NULL
671
};
673
- int i;
672
673
if (prompt > 0)
674
env[2] = "GIT_DIFFTOOL_PROMPT=true";
675
else if (!prompt)
676
env[2] = "GIT_DIFFTOOL_NO_PROMPT=true";
677
678
+ child->git_cmd = 1;
679
+ child->dir = prefix;
680
+ strvec_pushv(&child->env_array, env);
681
681
- for (i = 0; i < argc; i++)
682
- strvec_push(&args, argv[i]);
683
- return run_command_v_opt_cd_env(args.v, RUN_GIT_CMD, prefix, env);
682
+ return run_command(child);
683
}
684
685
int cmd_difftool(int argc, const char **argv, const char *prefix)
@@ -770,5 +769,5 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
769
770
if (dir_diff)
771
return run_dir_diff(extcmd, symlinks, prefix, &child);
773
- return run_file_diff(prompt, prefix, child.args.nr, child.args.v);
772
+ return run_file_diff(prompt, prefix, &child);
773
}