From: Elijah Newren <newren@gmail.com>
Date: Mon, 13 Nov 2017 20:16:00 +0000 (-0800)
Subject: sequencer: show rename progress during cherry picks
X-Git-Tag: v2.16.0-rc0~50^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9268cf4a2ef61c334204b1237b2174a77d16f98d;p=thirdparty%2Fgit.git

sequencer: show rename progress during cherry picks

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 <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/sequencer.c b/sequencer.c
index 1aa769c82d..c9e30776c2 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();