[PATCH 06/10] run-command API: remove RUN_COMMAND_STDOUT_TO_STDERR flag
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Oct 14, 2022, 15:40 UTC
- Message-ID
- <patch-06.10-9d0286fbf64-20221014T153426Z-avarab@gmail.com>
- In-Reply-To
- <cover-00.10-00000000000-20221014T153426Z-avarab@gmail.com>
The run_command_v_opt*() API is meant to handle various common cases where we don't want the verbosity of calling the underlying run_command(), but we're explicitly not trying to cover the full API surface of run_command() itself.
So if we're not using some of these flags we probably won't need them again, any future user who needs to set "stdout_to_stderr" can just use run_command() itself, and the convenience API shouldn't be cluttered by trying to handle all the needs of various one-offs.
So let's remove the RUN_COMMAND_STDOUT_TO_STDERR flag, it hasn't been used since 860a2ebecd2 (receive-pack: send auto-gc output over sideband 2, 2016-06-05) when its last user started using the underlying API directly.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- run-command.c | 1 - run-command.h | 12 +++++------- 2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/run-command.c b/run-command.c index 0be5626f7f2..fe1b4a0b650 100644 --- a/run-command.c +++ b/run-command.c @@ -1008,7 +1008,6 @@ static void run_command_set_opts(struct child_process *cmd, int opt) { cmd->no_stdin = opt & RUN_COMMAND_NO_STDIN ? 1 : 0; cmd->git_cmd = opt & RUN_GIT_CMD ? 1 : 0; - cmd->stdout_to_stderr = opt & RUN_COMMAND_STDOUT_TO_STDERR ? 1 : 0; cmd->silent_exec_failure = opt & RUN_SILENT_EXEC_FAILURE ? 1 : 0; cmd->use_shell = opt & RUN_USING_SHELL ? 1 : 0; cmd->clean_on_exit = opt & RUN_CLEAN_ON_EXIT ? 1 : 0; diff --git a/run-command.h b/run-command.h index cf250e36426..0af01bd9b67 100644 --- a/run-command.h +++ b/run-command.h @@ -226,12 +226,11 @@ int run_auto_maintenance(int quiet); #define RUN_COMMAND_NO_STDIN (1<<0) #define RUN_GIT_CMD (1<<1) -#define RUN_COMMAND_STDOUT_TO_STDERR (1<<2) -#define RUN_SILENT_EXEC_FAILURE (1<<3) -#define RUN_USING_SHELL (1<<4) -#define RUN_CLEAN_ON_EXIT (1<<5) -#define RUN_WAIT_AFTER_CLEAN (1<<6) -#define RUN_CLOSE_OBJECT_STORE (1<<7) +#define RUN_SILENT_EXEC_FAILURE (1<<2) +#define RUN_USING_SHELL (1<<3) +#define RUN_CLEAN_ON_EXIT (1<<4) +#define RUN_WAIT_AFTER_CLEAN (1<<5) +#define RUN_CLOSE_OBJECT_STORE (1<<6) /** * The run_command_v_opt*() API is a convenience wrapper for an @@ -249,7 +248,6 @@ int run_auto_maintenance(int quiet); * * - RUN_COMMAND_NO_STDIN: .no_stdin * - RUN_GIT_CMD: .git_cmd - * - RUN_COMMAND_STDOUT_TO_STDERR: .stdout_to_stderr * - RUN_SILENT_EXEC_FAILURE: .silent_exec_failure * - RUN_USING_SHELL: .use_shell * - RUN_CLEAN_ON_EXIT: .clean_on_exit
-- 2.38.0.1092.g8c0298861b0