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 /t | |
| 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 't')
| -rwxr-xr-x | t/t4001-diff-rename.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 0d1fa45..eadf4f6 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -230,4 +230,19 @@ test_expect_success 'rename pretty print common prefix and suffix overlap' ' test_i18ngrep " d/f/{ => f}/e " output ' +test_expect_success 'diff-tree -l0 defaults to a big rename limit, not zero' ' + test_write_lines line1 line2 line3 >myfile && + git add myfile && + git commit -m x && + + test_write_lines line1 line2 line4 >myotherfile && + git rm myfile && + git add myotherfile && + git commit -m x && + + git diff-tree -M -l0 HEAD HEAD^ >actual && + # Verify that a rename from myotherfile to myfile was detected + grep "myotherfile.*myfile" actual +' + test_done |