Re: [PATCH 4/4] sequencer: Show rename progress during cherry picks
From: Junio C Hamano <hidden>
Date: 2017-11-13 05:25:47
Elijah Newren [off-list ref] writes:
Subject: Re: [PATCH 4/4] sequencer: Show rename progress during cherry picks
Style: s/Show/show/
When trying to cherry-pick a change that has lots of renames, it is somewhat unsettling to wait a really long time without any feedback. Signed-off-by: Elijah Newren <redacted> --- sequencer.c | 1 + 1 file changed, 1 insertion(+)
Makes sense.
quoted hunk
diff --git a/sequencer.c b/sequencer.c index 2b4cecb617..247d93f363 100644 --- a/sequencer.c +++ b/sequencer.c@@ -448,6 +448,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next, o.branch2 = next ? next_label : "(empty tree)"; if (is_rebase_i(opts)) o.buffer_output = 2; + o.show_rename_progress = 1; head_tree = parse_tree_indirect(head); next_tree = next ? next->tree : empty_tree();