| test_description='merging with large rename matrix' |
| test_expect_success 'setup (initial)' ' |
| test_expect_success "rename ($1, $2)" ' |
| git checkout -f master && |
| git branch -D test$n || true && |
| git reset --hard initial && |
| make_text $i initial initial >$i |
| make_text $i changed initial >$i |
| git commit -a -m change=$n && |
| git checkout -b test$n HEAD^ && |
| make_text $i initial changed >$i.moved |
| git commit -m change+rename=$n && |
| *) test_must_fail git merge master ;; |
| test_expect_success 'set diff.renamelimit to 4' ' |
| git config diff.renamelimit 4 |
| test_expect_success 'set merge.renamelimit to 5' ' |
| git config merge.renamelimit 5 |