diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-03-01 14:02:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-01 14:02:56 -0800 |
| commit | 12bd17521c732ea6de47ec5fd9621a2bca451fe6 (patch) | |
| tree | 385480a0dfd083c1dcce8485eabbe6b1d062fee6 /t | |
| parent | Merge branch 'jh/fsmonitor-prework' (diff) | |
| parent | merge-ort: call diffcore_rename() directly (diff) | |
| download | tgif-12bd17521c732ea6de47ec5fd9621a2bca451fe6.tar.xz | |
Merge branch 'en/diffcore-rename'
Performance optimization work on the rename detection continues.
* en/diffcore-rename:
merge-ort: call diffcore_rename() directly
gitdiffcore doc: mention new preliminary step for rename detection
diffcore-rename: guide inexact rename detection based on basenames
diffcore-rename: complete find_basename_matches()
diffcore-rename: compute basenames of source and dest candidates
t4001: add a test comparing basename similarity and content similarity
diffcore-rename: filter rename_src list when possible
diffcore-rename: no point trying to find a match better than exact
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4001-diff-rename.sh | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 2f9700742a..68f2ebca58 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -262,4 +262,28 @@ test_expect_success 'diff-tree -l0 defaults to a big rename limit, not zero' ' grep "myotherfile.*myfile" actual ' +test_expect_success 'basename similarity vs best similarity' ' + mkdir subdir && + test_write_lines line1 line2 line3 line4 line5 \ + line6 line7 line8 line9 line10 >subdir/file.txt && + git add subdir/file.txt && + git commit -m "base txt" && + + git rm subdir/file.txt && + test_write_lines line1 line2 line3 line4 line5 \ + line6 line7 line8 >file.txt && + test_write_lines line1 line2 line3 line4 line5 \ + line6 line7 line8 line9 >file.md && + git add file.txt file.md && + git commit -a -m "rename" && + git diff-tree -r -M --name-status HEAD^ HEAD >actual && + # subdir/file.txt is 88% similar to file.md, 78% similar to file.txt, + # but since same basenames are checked first... + cat >expected <<-\EOF && + A file.md + R078 subdir/file.txt file.txt + EOF + test_cmp expected actual +' + test_done |