Merge branch 'ab/env-array'

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index bb4046aab33ddd0bdba960a0edf8732cc2bdf372..950733af2adf2a4156360cf2ca35bc92330e8f69 100644 (file)
--- 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");