diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:47 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-12-15 09:39:47 -0800 |
commit | 832ec72c3e15820c3b728b3a56398655d7bb7cb3 (patch) | |
tree | e2139982bd0e26cf3434a3e4edbc3d03ec44ec10 /object-file.c | |
parent | 9c5bef3b358b12b9af5d54014f4efc62588f5df1 (diff) | |
parent | c7c4bdeccf3e737e6e674cd9f0828922e629ab06 (diff) | |
download | git-832ec72c3e15820c3b728b3a56398655d7bb7cb3.tar.gz |
Merge branch 'ab/run-command'
API clean-up.
* ab/run-command:
run-command API: remove "env" member, always use "env_array"
difftool: use "env_array" to simplify memory management
run-command API: remove "argv" member, always use "args"
run-command API users: use strvec_push(), not argv construction
run-command API users: use strvec_pushl(), not argv construction
run-command tests: use strvec_pushv(), not argv assignment
run-command API users: use strvec_pushv(), not argv assignment
upload-archive: use regular "struct child_process" pattern
worktree: stop being overly intimate with run_command() internals
Diffstat (limited to 'object-file.c')
-rw-r--r-- | object-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/object-file.c b/object-file.c index 7ab1446df4..eb1426f98c 100644 --- a/object-file.c +++ b/object-file.c @@ -794,7 +794,7 @@ static void fill_alternate_refs_command(struct child_process *cmd, } } - cmd->env = local_repo_env; + strvec_pushv(&cmd->env_array, (const char **)local_repo_env); cmd->out = -1; } |