On Thu, Dec 16 2021, Jeff King wrote: > On Thu, Dec 16, 2021 at 12:51:55PM +0100, Ævar Arnfjörð Bjarmason wrote: > >> Or maybe you're not interested in either case, which is also fine. It's >> really not needed for anything other than to resolve the minor oddity >> that we have two "struct strvec"'s, "args" and "env_array". It's just a >> bit odd to have one with "_array" in the name, which is only because the >> now-removed "env" was taken at the time. > > Yeah, FWIW I absolutely hated "env_array" when I added it, but didn't > want to do the transition all at once, so needed another name. So I > would be happy to see it become "env" now. ;) Perhaps this follow-up to 832ec72c3e1 (Merge branch 'ab/run-command', 2021-12-15) will warm Jeff's heart if/when he returns from his git sabbatical :) Junio: We're in the RC period, but perhaps this change if we're ever going to make it would be good to make around that time of patch slowdown. I.e. for the first batch after release. I've been holding onto this since around December, but when I checked there was always 1-2 series that was adding new use of "env_array", resolving that conflict didn't seem worth the hassle. Right now this doesn't conflict with anything in "seen". The scary-at-first diffstat is almost entirely in 2/3, and everything except a two-line change in that commit is made by the coccinelle rule added in 1/3. So this series for reviewing is really: * A trivial coccinelle rule in 1/3 * The trivial 2 line change in run-command.h in 2/3 that isn't made by that rule * Subsequent trivial cleanup in 3/3 changing s/env_array/env/g in comments & variable names Ævar Arnfjörð Bjarmason (3): cocci: add a rename of "struct child_process"'s "env_array" to "env" run-command API: rename "env_array" to "env" run-command API users: use "env" not "env_array" in comments & names add-patch.c | 2 +- branch.c | 2 +- builtin/difftool.c | 6 ++-- builtin/receive-pack.c | 32 ++++++++++---------- builtin/stash.c | 16 +++++----- builtin/submodule--helper.c | 44 ++++++++++++++-------------- builtin/worktree.c | 8 ++--- connect.c | 9 +++--- connected.c | 2 +- contrib/coccinelle/run_command.cocci | 11 +++++++ daemon.c | 14 ++++----- editor.c | 2 +- hook.c | 2 +- http-backend.c | 4 +-- object-file.c | 2 +- pager.c | 4 +-- promisor-remote.c | 2 +- run-command.c | 19 ++++++------ run-command.h | 14 ++++----- sequencer.c | 18 ++++++------ submodule.c | 38 ++++++++++++------------ submodule.h | 4 +-- t/helper/test-run-command.c | 2 +- trailer.c | 2 +- transport-helper.c | 2 +- wt-status.c | 2 +- 26 files changed, 138 insertions(+), 125 deletions(-) create mode 100644 contrib/coccinelle/run_command.cocci -- 2.36.0.rc0.849.g2d5b5d9ab01
