diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-06-10 22:04:13 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-06-10 22:04:13 (GMT) |
| commit | c21fa3bb549a7769f9d508f0a5f95c654539e1f7 (patch) | |
| tree | b6998d52e7a03a0aff33d2cdce53a23bfa553996 /sequencer.c | |
| parent | 597553e42e816b58cad857d759f11c5f53a01510 (diff) | |
| parent | b3193252c4278e9039fbb896a35f84abc1fb5aac (diff) | |
| download | git-c21fa3bb549a7769f9d508f0a5f95c654539e1f7.zip git-c21fa3bb549a7769f9d508f0a5f95c654539e1f7.tar.gz git-c21fa3bb549a7769f9d508f0a5f95c654539e1f7.tar.bz2 | |
Merge branch 'ab/env-array'
Rename .env_array member to .env in the child_process structure.
* ab/env-array:
run-command API users: use "env" not "env_array" in comments & names
run-command API: rename "env_array" to "env"
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sequencer.c b/sequencer.c index bb4046a..950733a 100644 --- a/sequencer.c +++ b/sequencer.c @@ -919,7 +919,7 @@ static char *get_author(const char *message) return NULL; } -static const char *author_date_from_env_array(const struct strvec *env) +static const char *author_date_from_env(const struct strvec *env) { int i; const char *date; @@ -1000,7 +1000,7 @@ static int run_git_commit(const char *defmsg, if (is_rebase_i(opts) && ((opts->committer_date_is_author_date && !opts->ignore_date) || !(!defmsg && (flags & AMEND_MSG))) && - read_env_script(&cmd.env_array)) { + read_env_script(&cmd.env)) { const char *gpg_opt = gpg_sign_opt_quoted(opts); return error(_(staged_changes_advice), @@ -1008,12 +1008,12 @@ static int run_git_commit(const char *defmsg, } if (opts->committer_date_is_author_date) - strvec_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s", + strvec_pushf(&cmd.env, "GIT_COMMITTER_DATE=%s", opts->ignore_date ? "" : - author_date_from_env_array(&cmd.env_array)); + author_date_from_env(&cmd.env)); if (opts->ignore_date) - strvec_push(&cmd.env_array, "GIT_AUTHOR_DATE="); + strvec_push(&cmd.env, "GIT_AUTHOR_DATE="); strvec_push(&cmd.args, "commit"); @@ -3913,7 +3913,7 @@ static int do_merge(struct repository *r, /* Octopus merge */ struct child_process cmd = CHILD_PROCESS_INIT; - if (read_env_script(&cmd.env_array)) { + if (read_env_script(&cmd.env)) { const char *gpg_opt = gpg_sign_opt_quoted(opts); ret = error(_(staged_changes_advice), gpg_opt, gpg_opt); @@ -3921,12 +3921,12 @@ static int do_merge(struct repository *r, } if (opts->committer_date_is_author_date) - strvec_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s", + strvec_pushf(&cmd.env, "GIT_COMMITTER_DATE=%s", opts->ignore_date ? "" : - author_date_from_env_array(&cmd.env_array)); + author_date_from_env(&cmd.env)); if (opts->ignore_date) - strvec_push(&cmd.env_array, "GIT_AUTHOR_DATE="); + strvec_push(&cmd.env, "GIT_AUTHOR_DATE="); cmd.git_cmd = 1; strvec_push(&cmd.args, "merge"); |