Update basic tests to use the new option find-renames instead of
rename-threshold. Add tests to verify that rename-threshold=<n> behaves
as a synonym for find-renames=<n>. Test that find-renames resets
threshold.
Signed-off-by: Felipe Gonçalves Assis <felipegas...@gmail.com>
---
t/t3034-merge-recursive-rename-options.sh | 48 +++++++++++++++++++++++++++----
1 file changed, 42 insertions(+), 6 deletions(-)
diff --git a/t/t3034-merge-recursive-rename-options.sh
b/t/t3034-merge-recursive-rename-options.sh
index 2f10fa7..7fea7bd 100755
--- a/t/t3034-merge-recursive-rename-options.sh
+++ b/t/t3034-merge-recursive-rename-options.sh
@@ -115,25 +115,25 @@ test_expect_success 'the default similarity index is 50%'
'
test_expect_success 'low rename threshold' '
git read-tree --reset -u HEAD &&
- test_must_fail git merge-recursive --rename-threshold=25 HEAD^ -- HEAD
master &&
+ test_must_fail git merge-recursive --find-renames=25 HEAD^ -- HEAD
master &&
check_find_renames_25
'
test_expect_success 'high rename threshold' '
git read-tree --reset -u HEAD &&
- test_must_fail git merge-recursive --rename-threshold=75 HEAD^ -- HEAD
master &&
+ test_must_fail git merge-recursive --find-renames=75 HEAD^ -- HEAD
master &&
check_find_renames_75
'
test_expect_success 'exact renames only' '
git read-tree --reset -u HEAD &&
- test_must_fail git merge-recursive --rename-threshold=100% HEAD^ --
HEAD master &&
+ test_must_fail git merge-recursive --find-renames=100% HEAD^ -- HEAD
master &&
check_find_renames_100
'
test_expect_success 'rename threshold is truncated' '
git read-tree --reset -u HEAD &&
- test_must_fail git merge-recursive --rename-threshold=200% HEAD^ --
HEAD master &&
+ test_must_fail git merge-recursive --find-renames=200% HEAD^ -- HEAD
master &&
check_find_renames_100
'
@@ -143,12 +143,36 @@ test_expect_success 'disabled rename detection' '
check_no_renames
'
-test_expect_success 'last wins in --rename-threshold=<m>
--rename-threshold=<n>' '
+test_expect_success 'last wins in --find-renames=<m> --find-renames=<n>' '
git read-tree --reset -u HEAD &&
- test_must_fail git merge-recursive --rename-threshold=25
--rename-threshold=75 HEAD^ -- HEAD master &&
+ test_must_fail git merge-recursive --find-renames=25 --find-renames=75
HEAD^ -- HEAD master &&
check_find_renames_75
'
+test_expect_success '--find-renames resets threshold' '
+ git read-tree --reset -u HEAD &&
+ test_must_fail git merge-recursive --find-renames=25 --find-renames
HEAD^ -- HEAD master &&
+ check_find_renames_50
+'
+
+test_expect_success 'last wins in --no-renames --find-renames' '
+ git read-tree --reset -u HEAD &&
+ test_must_fail git merge-recursive --no-renames --find-renames HEAD^ --
HEAD master &&
+ check_find_renames_50
+'
+
+test_expect_success 'last wins in --find-renames --no-renames' '
+ git read-tree --reset -u HEAD &&
+ git merge-recursive --find-renames --no-renames HEAD^ -- HEAD master &&
+ check_no_renames
+'
+
+test_expect_success 'rename-threshold=<n> is a synonym for find-renames=<n>' '
+ git read-tree --reset -u HEAD &&
+ test_must_fail git merge-recursive --rename-threshold=25 HEAD^ -- HEAD
master &&
+ check_find_renames_25
+'
+
test_expect_success 'last wins in --no-renames --rename-threshold=<n>' '
git read-tree --reset -u HEAD &&
test_must_fail git merge-recursive --no-renames --rename-threshold=25
HEAD^ -- HEAD master &&
@@ -161,4 +185,16 @@ test_expect_success 'last wins in --rename-threshold=<n>
--no-renames' '
check_no_renames
'
+test_expect_success 'last wins in --rename-threshold=<n> --find-renames' '
+ git read-tree --reset -u HEAD &&
+ test_must_fail git merge-recursive --rename-threshold=25 --find-renames
HEAD^ -- HEAD master &&
+ check_find_renames_50
+'
+
+test_expect_success 'last wins in --find-renames --rename-threshold=<n>' '
+ git read-tree --reset -u HEAD &&
+ test_must_fail git merge-recursive --find-renames --rename-threshold=25
HEAD^ -- HEAD master &&
+ check_find_renames_25
+'
+
test_done
--
2.7.1.492.gc9722f8
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
