summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2022-06-02 09:09:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-06-02 21:31:27 (GMT)
commitb3193252c4278e9039fbb896a35f84abc1fb5aac (patch)
tree5d45de5926140db39554d062207cca36d7e284d2 /sequencer.c
parent29fda24dd11e90583f3ea9ff2f90ee9acacd7792 (diff)
downloadgit-b3193252c4278e9039fbb896a35f84abc1fb5aac.zip
git-b3193252c4278e9039fbb896a35f84abc1fb5aac.tar.gz
git-b3193252c4278e9039fbb896a35f84abc1fb5aac.tar.bz2
run-command API users: use "env" not "env_array" in comments & names
Follow-up on a preceding commit which changed all references to the "env_array" when referring to the "struct child_process" member. These changes are all unnecessary for the compiler, but help the code's human readers. All the comments that referred to "env_array" have now been updated, as well as function names and variables that had "env_array" in their name, they now refer to "env". In addition the "out" name for the submodule.h prototype was inconsistent with the function definition's use of "env_array" in submodule.c. Both of them use "env" now. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sequencer.c b/sequencer.c
index 3d0331b..79e14b5 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;
@@ -1011,7 +1011,7 @@ static int run_git_commit(const char *defmsg,
strvec_pushf(&cmd.env, "GIT_COMMITTER_DATE=%s",
opts->ignore_date ?
"" :
- author_date_from_env_array(&cmd.env));
+ author_date_from_env(&cmd.env));
if (opts->ignore_date)
strvec_push(&cmd.env, "GIT_AUTHOR_DATE=");
@@ -3923,7 +3923,7 @@ static int do_merge(struct repository *r,
strvec_pushf(&cmd.env, "GIT_COMMITTER_DATE=%s",
opts->ignore_date ?
"" :
- author_date_from_env_array(&cmd.env));
+ author_date_from_env(&cmd.env));
if (opts->ignore_date)
strvec_push(&cmd.env, "GIT_AUTHOR_DATE=");