From: Jeff King Date: Mon, 10 May 2010 09:47:39 +0000 (-0400) Subject: tests: rename duplicate t4205 X-Git-Tag: v1.7.2-rc0~103^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9feeaa2bf39aed4a0148296f504f88b09b8901d4;p=git.git tests: rename duplicate t4205 Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/t/t4205-log-follow-harder-copies.sh b/t/t4205-log-follow-harder-copies.sh deleted file mode 100755 index ad29e65fc..000000000 --- a/t/t4205-log-follow-harder-copies.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2010 Bo Yang -# - -test_description='Test --follow should always find copies hard in git log. - -' -. ./test-lib.sh -. "$TEST_DIRECTORY"/diff-lib.sh - -echo >path0 'Line 1 -Line 2 -Line 3 -' - -test_expect_success \ - 'add a file path0 and commit.' \ - 'git add path0 && - git commit -m "Add path0"' - -echo >path0 'New line 1 -New line 2 -New line 3 -' -test_expect_success \ - 'Change path0.' \ - 'git add path0 && - git commit -m "Change path0"' - -cat path1 -test_expect_success \ - 'copy path0 to path1.' \ - 'git add path1 && - git commit -m "Copy path1 from path0"' - -test_expect_success \ - 'find the copy path0 -> path1 harder' \ - 'git log --follow --name-status --pretty="format:%s" path1 > current' - -cat >expected <<\EOF -Copy path1 from path0 -C100 path0 path1 - -Change path0 -M path0 - -Add path0 -A path0 -EOF - -test_expect_success \ - 'validate the output.' \ - 'compare_diff_patch current expected' - -test_done diff --git a/t/t4206-log-follow-harder-copies.sh b/t/t4206-log-follow-harder-copies.sh new file mode 100755 index 000000000..ad29e65fc --- /dev/null +++ b/t/t4206-log-follow-harder-copies.sh @@ -0,0 +1,56 @@ +#!/bin/sh +# +# Copyright (c) 2010 Bo Yang +# + +test_description='Test --follow should always find copies hard in git log. + +' +. ./test-lib.sh +. "$TEST_DIRECTORY"/diff-lib.sh + +echo >path0 'Line 1 +Line 2 +Line 3 +' + +test_expect_success \ + 'add a file path0 and commit.' \ + 'git add path0 && + git commit -m "Add path0"' + +echo >path0 'New line 1 +New line 2 +New line 3 +' +test_expect_success \ + 'Change path0.' \ + 'git add path0 && + git commit -m "Change path0"' + +cat path1 +test_expect_success \ + 'copy path0 to path1.' \ + 'git add path1 && + git commit -m "Copy path1 from path0"' + +test_expect_success \ + 'find the copy path0 -> path1 harder' \ + 'git log --follow --name-status --pretty="format:%s" path1 > current' + +cat >expected <<\EOF +Copy path1 from path0 +C100 path0 path1 + +Change path0 +M path0 + +Add path0 +A path0 +EOF + +test_expect_success \ + 'validate the output.' \ + 'compare_diff_patch current expected' + +test_done