diff options
author | Elijah Newren <newren@gmail.com> | 2020-08-10 22:29:09 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-08-10 15:59:00 -0700 |
commit | 919df3195553af05c884d51588d12134d8dfab2a (patch) | |
tree | 5be83bccf1bb0554cebcf9687c637a175fb62d93 /t/t6032-merge-large-rename.sh | |
parent | 4f0a8be78499454eac3985b6e7e144b8376ab0a5 (diff) | |
download | git-919df3195553af05c884d51588d12134d8dfab2a.tar.gz |
Collect merge-related tests to t64xx
The tests for the merge machinery are spread over several places.
Collect them into t64xx for simplicity. Some notes:
t60[234]*.sh:
Merge tests started in t602*, overgrew bisect and remote tracking
tests in t6030, t6040, and t6041, and nearly overtook replace tests
in t6050. This made picking out relevant tests that I wanted to run
in a tighter loop slightly more annoying for years.
t303*.sh:
These started out as tests for the 'merge-recursive' toplevel command,
but did not restrict to that and had lots of overlap with the
underlying merge machinery.
t7405, t7613:
submodule-specific merge logic started out in submodule.c but was
moved to merge-recursive.c in commit 18cfc08866 ("submodule.c: move
submodule merging to merge-recursive.c", 2018-05-15). Since these
tests are about the logic found in the merge machinery, moving these
tests to be with the merge tests makes sense.
t7607, t7609:
Having tests spread all over the place makes it more likely that
additional tests related to a certain piece of logic grow in all those
other places. Much like t303*.sh, these two tests were about the
underlying merge machinery rather than outer levels.
Tests that were NOT moved:
t76[01]*.sh:
Other than the four tests mentioned above, the remaining tests in
t76[01]*.sh are related to non-recursive merge strategies, parameter
parsing, and other stuff associated with the highlevel builtin/merge.c
rather than the recursive merge machinery.
t3[45]*.sh:
The rebase testcases in t34*.sh also test the merge logic pretty
heavily; sometimes changes I make only trigger failures in the rebase
tests. The rebase tests are already nicely coupled together, though,
and I didn't want to mess that up. Similar comments apply for the
cherry-pick tests in t35*.sh.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6032-merge-large-rename.sh')
-rwxr-xr-x | t/t6032-merge-large-rename.sh | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/t/t6032-merge-large-rename.sh b/t/t6032-merge-large-rename.sh deleted file mode 100755 index 80777386dc..0000000000 --- a/t/t6032-merge-large-rename.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh - -test_description='merging with large rename matrix' -. ./test-lib.sh - -count() { - i=1 - while test $i -le $1; do - echo $i - i=$(($i + 1)) - done -} - -test_expect_success 'setup (initial)' ' - touch file && - git add . && - git commit -m initial && - git tag initial -' - -make_text() { - echo $1: $2 - for i in $(count 20); do - echo $1: $i - done - echo $1: $3 -} - -test_rename() { - test_expect_success "rename ($1, $2)" ' - n='$1' && - expect='$2' && - git checkout -f master && - test_might_fail git branch -D test$n && - git reset --hard initial && - for i in $(count $n); do - make_text $i initial initial >$i - done && - git add . && - git commit -m add=$n && - for i in $(count $n); do - make_text $i changed initial >$i - done && - git commit -a -m change=$n && - git checkout -b test$n HEAD^ && - for i in $(count $n); do - git rm $i - make_text $i initial changed >$i.moved - done && - git add . && - git commit -m change+rename=$n && - case "$expect" in - ok) git merge master ;; - *) test_must_fail git merge master ;; - esac - ' -} - -test_rename 5 ok - -test_expect_success 'set diff.renamelimit to 4' ' - git config diff.renamelimit 4 -' -test_rename 4 ok -test_rename 5 fail - -test_expect_success 'set merge.renamelimit to 5' ' - git config merge.renamelimit 5 -' -test_rename 5 ok -test_rename 6 fail - -test_expect_success 'setup large simple rename' ' - git config --unset merge.renamelimit && - git config --unset diff.renamelimit && - - git reset --hard initial && - for i in $(count 200); do - make_text foo bar baz >$i - done && - git add . && - git commit -m create-files && - - git branch simple-change && - git checkout -b simple-rename && - - mkdir builtin && - git mv [0-9]* builtin/ && - git commit -m renamed && - - git checkout simple-change && - >unrelated-change && - git add unrelated-change && - git commit -m unrelated-change -' - -test_expect_success 'massive simple rename does not spam added files' ' - sane_unset GIT_MERGE_VERBOSITY && - git merge --no-stat simple-rename | grep -v Removing >output && - test_line_count -lt 5 output -' - -test_done |