mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer: add a new function to silence a command, except if it fails

Browse Source 
This adds a new function, run_command_silent_on_success(), to
redirect the stdout and stderr of a command to a strbuf, and then to run
that command. This strbuf is printed only if the command fails. It is
functionnaly similar to output() from git-rebase.sh.

run_git_commit() is then refactored to use of
run_command_silent_on_success().

Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alban Gruin
2018-08-10 18:51:32 +02:00
committed by Junio C Hamano
parent 64a43cbd5d
commit 34bec2c458
1 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
sequencer.c
View File

@ -769,6 +769,23 @@ N_("you have staged changes in your working tree\n"
#define VERIFY_MSG (1<<4) #define VERIFY_MSG (1<<4)
#define CREATE_ROOT_COMMIT (1<<5) #define CREATE_ROOT_COMMIT (1<<5)
static int run_command_silent_on_success(struct child_process *cmd)
{
struct strbuf buf = STRBUF_INIT;
int rc;
cmd->stdout_to_stderr = 1;
rc = pipe_command(cmd,
NULL, 0,
NULL, 0,
&buf, 0);
if (rc)
fputs(buf.buf, stderr);
strbuf_release(&buf);
return rc;
}
/* /*
* If we are cherry-pick, and if the merge did not result in * If we are cherry-pick, and if the merge did not result in
* hand-editing, we will hit this commit and inherit the original * hand-editing, we will hit this commit and inherit the original
@ -823,19 +840,12 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
cmd.git_cmd = 1; cmd.git_cmd = 1;
if (is_rebase_i(opts)) { if (is_rebase_i(opts) && read_env_script(&cmd.env_array)) {
if (!(flags & EDIT_MSG)) {
cmd.stdout_to_stderr = 1;
cmd.err = -1;
}
if (read_env_script(&cmd.env_array)) {
const char *gpg_opt = gpg_sign_opt_quoted(opts); const char *gpg_opt = gpg_sign_opt_quoted(opts);
return error(_(staged_changes_advice), return error(_(staged_changes_advice),
gpg_opt, gpg_opt); gpg_opt, gpg_opt);
} }
}
argv_array_push(&cmd.args, "commit"); argv_array_push(&cmd.args, "commit");
@ -864,20 +874,9 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
if (opts->allow_empty_message) if (opts->allow_empty_message)
argv_array_push(&cmd.args, "--allow-empty-message"); argv_array_push(&cmd.args, "--allow-empty-message");
if (cmd.err == -1) { if (is_rebase_i(opts) && !(flags & EDIT_MSG))
/* hide stderr on success */ return run_command_silent_on_success(&cmd);
struct strbuf buf = STRBUF_INIT; else
int rc = pipe_command(&cmd,
NULL, 0,
/* stdout is already redirected */
NULL, 0,
&buf, 0);
if (rc)
fputs(buf.buf, stderr);
strbuf_release(&buf);
return rc;
}
return run_command(&cmd); return run_command(&cmd);
} }