diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-06-28 15:53:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-06-28 15:53:16 -0700 |
| commit | 7b7db54b8319aa4f31348debb4bd9b838753aa8c (patch) | |
| tree | b4928d7e6294890e8761d46c1665fbffa60bfa48 | |
| parent | 6e3eb346edf9f9b701c916148a3cdd74505fdd11 (diff) | |
| parent | 36d900d2b0b861d4cb359ddbaa904de90336eb71 (diff) | |
| download | git-7b7db54b8319aa4f31348debb4bd9b838753aa8c.tar.xz | |
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()
| -rw-r--r-- | builtin/difftool.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index a3c72b8258..06a6c14847 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -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); } |