diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-19 19:33:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-19 19:33:55 (GMT) |
| commit | 646685460c26d56b149da91544e76150119d9c9b (patch) | |
| tree | 849f52fe2d1497e9bf6bb57ea4d06f3d0e190be9 /sequencer.c | |
| parent | 52015aaf9d19c97b52c47c7046058e6d029ff856 (diff) | |
| parent | 89973554b52cb533b01acfdcb16d8215344bf004 (diff) | |
| download | git-646685460c26d56b149da91544e76150119d9c9b.zip git-646685460c26d56b149da91544e76150119d9c9b.tar.gz git-646685460c26d56b149da91544e76150119d9c9b.tar.bz2 | |
Merge branch 'en/rename-progress'
Historically, the diff machinery for rename detection had a
hardcoded limit of 32k paths; this is being lifted to allow users
trade cycles with a (possibly) easier to read result.
* en/rename-progress:
diffcore-rename: make diff-tree -l0 mean -l<large>
sequencer: show rename progress during cherry picks
diff: remove silent clamp of renameLimit
progress: fix progress meters when dealing with lots of work
sequencer: warn when internal merge may be suboptimal due to renameLimit
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index e90bc31..c8cb20c 100644 --- a/sequencer.c +++ b/sequencer.c @@ -449,6 +449,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(); @@ -463,6 +464,7 @@ static int do_recursive_merge(struct commit *base, struct commit *next, if (is_rebase_i(opts) && clean <= 0) fputs(o.obuf.buf, stdout); strbuf_release(&o.obuf); + diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0); if (clean < 0) return clean; |