Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
sequencer: show rename progress during cherry picks
author
Elijah Newren
<newren@gmail.com>
Mon, 13 Nov 2017 20:16:00 +0000
(12:16 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 15 Nov 2017 04:11:25 +0000
(13:11 +0900)
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>
sequencer.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
9f7e4bf
)
diff --git
a/sequencer.c
b/sequencer.c
index 1aa769c82d503d4bca56859d29a1d003282868a5..c9e30776c20b3e3f420ed659de6fb258b7b3e7b0 100644
(file)
--- 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();