From: Felipe Gonçalves Assis Date: Sun, 21 Feb 2016 22:59:04 GMT Subject: [PATCH v2 4/5] t3034: test deprecated interface Message-ID: <1456095545-20201-5-git-send-email-felipegassis@gmail.com> In-Reply-To: <1456095545-20201-1-git-send-email-felipegassis@gmail.com> --find-renames= and --rename-threshold= should be aliases. Signed-off-by: Felipe Gonçalves Assis --- Now includes tests with invalid arguments to --rename-threshold= t/t3034-merge-recursive-rename-options.sh | 42 +++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/t/t3034-merge-recursive-rename-options.sh b/t/t3034-merge-recursive-rename-options.sh index a459236..d4f9742 100755 --- a/t/t3034-merge-recursive-rename-options.sh +++ b/t/t3034-merge-recursive-rename-options.sh @@ -184,4 +184,46 @@ test_expect_success '--find-renames rejects non-numbers' ' git diff --quiet --cached ' +test_expect_success 'rename-threshold= is a synonym for find-renames=' ' + 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=' ' + git read-tree --reset -u HEAD && + test_must_fail git merge-recursive --no-renames --rename-threshold=25 HEAD^ -- HEAD master && + check_find_renames_25 +' + +test_expect_success 'last wins in --rename-threshold= --no-renames' ' + git read-tree --reset -u HEAD && + git merge-recursive --rename-threshold=25 --no-renames HEAD^ -- HEAD master && + check_no_renames +' + +test_expect_success '--rename-threshold= rejects negative argument' ' + git read-tree --reset -u HEAD && + test_must_fail git merge-recursive --rename-threshold=-25 HEAD -- HEAD HEAD && + git diff --quiet --cached +' + +test_expect_success '--rename-threshold= rejects non-numbers' ' + git read-tree --reset -u HEAD && + test_must_fail git merge-recursive --rename-threshold=0xf HEAD -- HEAD HEAD && + git diff --quiet --cached +' + +test_expect_success 'last wins in --rename-threshold= --find-renames=' ' + git read-tree --reset -u HEAD && + test_must_fail git merge-recursive --rename-threshold=25 --find-renames=75 HEAD^ -- HEAD master && + check_find_renames_75 +' + +test_expect_success 'last wins in --find-renames= --rename-threshold=' ' + git read-tree --reset -u HEAD && + test_must_fail git merge-recursive --find-renames=75 --rename-threshold=25 HEAD^ -- HEAD master && + check_find_renames_25 +' + test_done -- 2.7.1.492.gd821b20