global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-02 14:05:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

sequencer (rebase -i): show only failed git commit's output

Browse Source 
This is the behavior of the shell script version of the interactive
rebase, by using the `output` function defined in `git-rebase.sh`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2016-04-12 14:56:52 +02:00
parent 04b4f65d7e
commit 23d178b5af
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sequencer.c
View File

@@ -647,10 +647,15 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
{
char **env = NULL;
struct argv_array array;
int rc;
int opt = RUN_GIT_CMD, rc;
const char *value;
if (is_rebase_i(opts)) {
if (!edit) {
opt |= RUN_COMMAND_STDOUT_TO_STDERR;
opt |= RUN_HIDE_STDERR_ON_SUCCESS;
}
env = read_author_script();
if (!env) {
const char *gpg_opt = gpg_sign_opt_quoted(opts);
@@ -687,7 +692,7 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts,
if (opts->allow_empty_message)
argv_array_push(&array, "--allow-empty-message");
rc = run_command_v_opt_cd_env(array.argv, RUN_GIT_CMD, NULL,
rc = run_command_v_opt_cd_env(array.argv, opt, NULL,
(const char *const *)env);
argv_array_clear(&array);
free(env);