X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft4001-diff-rename.sh;h=2e3c20d6b9468bf413e97d422e7dbe13ac4238cd;hb=22669a045a062c7884735219bc4f5f8a8dd183a2;hp=933a5bfc6be1b898e7017cf3dc8246506fdfa039;hpb=427dcb4bca49117664d9428fd4e86483f516d703;p=git.git diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 933a5bfc..2e3c20d6 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,15 +38,15 @@ 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 old path0 -rename new path1 +rename from path0 +rename to path1 --- a/path0 +++ b/path1 @@ -8,7 +8,7 @@ Line 7 @@ -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