diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-28 14:11:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-28 14:11:43 -0700 |
| commit | 76a89d6d828486f96f42c69ef0cf87bb6b72fef5 (patch) | |
| tree | e5112817beba1e701d20e88b4d0c5bdf5fe7de0d /t/t4001-diff-rename.sh | |
| parent | 78c6e0f3fa41d697f2e01850b0a361e21095545d (diff) | |
| parent | f31027c99cb2ec4eb7ad8d1ebc7f0e20fef4bd1d (diff) | |
| download | git-76a89d6d828486f96f42c69ef0cf87bb6b72fef5.tar.gz git-76a89d6d828486f96f42c69ef0cf87bb6b72fef5.tar.xz | |
Merge branch 'jc/rename-degrade-cc-to-c'
* jc/rename-degrade-cc-to-c:
diffcore-rename: fall back to -C when -C -C busts the rename limit
diffcore-rename: record filepair for rename src
diffcore-rename: refactor "too many candidates" logic
builtin/diff.c: remove duplicated call to diff_result_code()
Diffstat (limited to 't/t4001-diff-rename.sh')
| -rwxr-xr-x | t/t4001-diff-rename.sh | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index cad85450b..3dadf9b31 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -77,4 +77,29 @@ test_expect_success C_LOCALE_OUTPUT 'favour same basenames even with minor diff git show HEAD:path1 | sed "s/15/16/" > subdir/path1 && git status | grep "renamed: .*path1 -> subdir/path1"' +test_expect_success 'setup for many rename source candidates' ' + git reset --hard && + for i in 0 1 2 3 4 5 6 7 8 9; + do + for j in 0 1 2 3 4 5 6 7 8 9; + do + echo "$i$j" >"path$i$j" + done + done && + git add "path??" && + test_tick && + git commit -m "hundred" && + (cat path1; echo new) >new-path && + echo old >>path1 && + git add new-path path1 && + git diff -l 4 -C -C --cached --name-status >actual 2>actual.err && + sed -e "s/^\([CM]\)[0-9]* /\1 /" actual >actual.munged && + cat >expect <<-EOF && + C path1 new-path + M path1 + EOF + test_cmp expect actual.munged && + grep warning actual.err +' + test_done |