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"

diff --cc branch.c
Simple merge

diff --cc builtin/receive-pack.c
index daa153d04461005fc031f9c4e51fc299bbef2883,acc512f3a36f2387bb9db9dcafb44c85131ef46c..e6e1d636f9c5ef9acde2d0ac92d36df43881df3a
--- 1/builtin/receive-pack.c
--- 2/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@@ -2214,7 -2214,8 +2214,7 @@@ static const char *unpack(int err_fd, s
                        close(err_fd);
                return "unable to create temporary object directory";
        }
-       strvec_pushv(&child.env_array, tmp_objdir_env(tmp_objdir));
 -      if (tmp_objdir)
 -              strvec_pushv(&child.env, tmp_objdir_env(tmp_objdir));
++      strvec_pushv(&child.env, tmp_objdir_env(tmp_objdir));
  
        /*
         * Normally we just pass the tmp_objdir environment to the child

diff --cc builtin/stash.c
Simple merge

diff --cc builtin/submodule--helper.c
Simple merge

diff --cc connect.c
Simple merge

diff --cc daemon.c
Simple merge

diff --cc object-file.c
Simple merge

diff --cc promisor-remote.c
Simple merge

diff --cc run-command.h
Simple merge

diff --cc sequencer.c
Simple merge

diff --cc submodule.c
Simple merge

diff --cc submodule.h
Simple merge

diff --cc trailer.c
Simple merge

diff --cc wt-status.c
Simple merge