summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorElijah Newren <newren@gmail.com>2017-11-13 20:16:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-11-15 04:11:25 (GMT)
commit9268cf4a2ef61c334204b1237b2174a77d16f98d (patch)
treec6cd0e850883795f5a0bed6ec87499069beffad7 /sequencer.c
parent9f7e4bfa3b6da16e3690312ff208cc27706b2c1b (diff)
downloadgit-9268cf4a2ef61c334204b1237b2174a77d16f98d.zip
git-9268cf4a2ef61c334204b1237b2174a77d16f98d.tar.gz
git-9268cf4a2ef61c334204b1237b2174a77d16f98d.tar.bz2
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>
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c
index 1aa769c..c9e3077 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();