From: Felipe Gonçalves Assis Date: Sun, 21 Feb 2016 22:59:03 GMT Subject: [PATCH v2 3/5] t3034: test option to disable renames Message-ID: <1456095545-20201-4-git-send-email-felipegassis@gmail.com> In-Reply-To: <1456095545-20201-1-git-send-email-felipegassis@gmail.com> Signed-off-by: Felipe Gonçalves Assis --- t/t3034-merge-recursive-rename-options.sh | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/t/t3034-merge-recursive-rename-options.sh b/t/t3034-merge-recursive-rename-options.sh index 7ae7f83..a459236 100755 --- a/t/t3034-merge-recursive-rename-options.sh +++ b/t/t3034-merge-recursive-rename-options.sh @@ -68,6 +68,14 @@ check_find_renames_100 () { rename_undetected d } +check_no_renames () { + check_common && + rename_undetected a && + rename_undetected b && + rename_undetected c && + rename_undetected d +} + test_expect_success setup ' cat <<-\EOF >a-old && aa1 @@ -126,12 +134,30 @@ test_expect_success 'rename threshold is truncated' ' check_find_renames_100 ' +test_expect_success 'disabled rename detection' ' + git read-tree --reset -u HEAD && + git merge-recursive --no-renames HEAD^ -- HEAD master && + check_no_renames +' + test_expect_success 'last wins in --find-renames= --find-renames=' ' git read-tree --reset -u HEAD && test_must_fail git merge-recursive --find-renames=25 --find-renames=75 HEAD^ -- HEAD master && check_find_renames_75 ' +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 'assumption for further tests: trivial merge succeeds' ' git read-tree --reset -u HEAD && git merge-recursive HEAD -- HEAD HEAD && @@ -141,6 +167,8 @@ test_expect_success 'assumption for further tests: trivial merge succeeds' ' git merge-recursive --find-renames=75 HEAD -- HEAD HEAD && git diff --quiet --cached && git merge-recursive --find-renames=100% HEAD -- HEAD HEAD && + git diff --quiet --cached && + git merge-recursive --no-renames HEAD -- HEAD HEAD && git diff --quiet --cached ' -- 2.7.1.492.gd821b20