From: Felipe Gonçalves Assis Date: Tue, 23 Feb 2016 04:38:44 GMT Subject: [PATCH 2/3] t3034: test option to disable renames Message-ID: <1456202325-6037-3-git-send-email-felipegassis@gmail.com> In-Reply-To: <1456202325-6037-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 66fee8a..03ce77c 100755 --- a/t/t3034-merge-recursive-rename-options.sh +++ b/t/t3034-merge-recursive-rename-options.sh @@ -83,6 +83,14 @@ check_exact_renames () { rename_detected 3 } +check_no_renames () { + check_common && + rename_undetected 0 && + rename_undetected 1 && + rename_undetected 2 && + rename_undetected 3 +} + test_expect_success 'setup 1/2: basic setup' ' cat <<-\EOF >3-old && 33a @@ -192,6 +200,12 @@ test_expect_success 'rename threshold is truncated' ' check_exact_renames ' +test_expect_success 'disabled rename detection' ' + git read-tree --reset -u HEAD && + git merge-recursive --no-renames $tail && + 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 \ @@ -206,6 +220,18 @@ test_expect_success '--find-renames resets threshold' ' $check_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 $tail && + $check_50 +' + +test_expect_success 'last wins in --find-renames --no-renames' ' + git read-tree --reset -u HEAD && + git merge-recursive --find-renames --no-renames $tail && + 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 && @@ -215,6 +241,8 @@ test_expect_success 'assumption for further tests: trivial merge succeeds' ' git merge-recursive --find-renames=${th[2]} 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