[PATCH v2 30/34] sequencer (rebase -i): show only failed cherry-picks' output
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Dec 13, 2016, 15:32 UTC
- Message-ID
- <45ba32ba1bb70ffe2f5034b638e3aa1936b5546d.1481642927.git.johannes.schindelin@gmx.de>
- In-Reply-To
- <cover.1481642927.git.johannes.schindelin@gmx.de>
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> --- sequencer.c | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/sequencer.c b/sequencer.c index dfa4fab98b..edc213a2c8 100644 --- a/sequencer.c +++ b/sequencer.c @@ -464,6 +464,8 @@ static int do_recursive_merge(struct commit *base, struct commit *next, o.ancestor = base ? base_label : "(empty tree)"; o.branch1 = "HEAD"; o.branch2 = next ? next_label : "(empty tree)"; + if (is_rebase_i(opts)) + o.buffer_output = 2; head_tree = parse_tree_indirect(head); next_tree = next ? next->tree : empty_tree(); @@ -475,6 +477,8 @@ static int do_recursive_merge(struct commit *base, struct commit *next, clean = merge_trees(&o, head_tree, next_tree, base_tree, &result); + if (is_rebase_i(opts) && clean <= 0) + fputs(o.obuf.buf, stdout); strbuf_release(&o.obuf); if (clean < 0) return clean;
-- 2.11.0.rc3.windows.1