X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft4001-diff-rename.sh;h=08c11319a70be6dfbcc530d9462c36254a3acd8e;hb=54c261f90fb8aa9a0f12431cce2c2631a119d667;hp=80edae6682bce319a754514602d7098b8c125b57;hpb=e8c80638abc99928dba9ac832589749a531e2e21;p=git.git diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 80edae66..08c11319 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -7,6 +7,7 @@ test_description='Test rename detection in diff engine. ' . ./test-lib.sh +. ../diff-lib.sh echo >path0 'Line 1 Line 2 @@ -27,7 +28,7 @@ Line 15 test_expect_success \ 'update-cache --add a file.' \ - 'git-update-cache --add path0' + 'git-update-index --add path0' test_expect_success \ 'write that tree.' \ @@ -37,18 +38,18 @@ sed -e 's/line/Line/' path1 rm -f path0 test_expect_success \ 'renamed and edited the file.' \ - 'git-update-cache --add --remove path0 path1' + 'git-update-index --add --remove path0 path1' test_expect_success \ - 'git-diff-cache -p -M after rename and editing.' \ - 'git-diff-cache -p -M $tree >current' + 'git-diff-index -p -M after rename and editing.' \ + 'git-diff-index -p -M $tree >current' cat >expected <<\EOF diff --git a/path0 b/path1 rename from path0 rename to path1 --- a/path0 +++ b/path1 -@@ -8,7 +8,7 @@ Line 7 +@@ -8,7 +8,7 @@ Line 8 Line 9 Line 10 @@ -61,6 +62,6 @@ EOF test_expect_success \ 'validate the output.' \ - 'diff -I "similarity.*" >/dev/null current expected' + 'compare_diff_patch current expected' test_done