X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft4000-diff-format.sh;h=beb6d8f4877c157bdf9e3efa2c914e74da863cd5;hb=4eba0f3763e2f4bbf614c99ae3a5b299e8d61aff;hp=3accb14f00b8d1b9cdcee1ca8eac34bd8e82e8ac;hpb=b30245c8e92ecaf8fb877189d7620a5a9a205120;p=git.git diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh index 3accb14f..beb6d8f4 100755 --- a/t/t4000-diff-format.sh +++ b/t/t4000-diff-format.sh @@ -7,6 +7,7 @@ test_description='Test built-in diff output engine. ' . ./test-lib.sh +. ../diff-lib.sh echo >path0 'Line 1 Line 2 @@ -16,7 +17,7 @@ chmod +x path1 test_expect_success \ 'update-cache --add two files with and without +x.' \ - 'git-update-cache --add path0 path1' + 'git-update-index --add path0 path1' mv path0 path0- sed -e 's/line/Line/' path0 @@ -48,15 +49,6 @@ EOF test_expect_success \ 'validate git-diff-files -p output.' \ - 'cmp -s current expected' - -test_expect_success \ - 'build same diff using git-diff-helper.' \ - 'git-diff-files -z | git-diff-helper -z >current' - - -test_expect_success \ - 'validate git-diff-helper output.' \ - 'cmp -s current expected' + 'compare_diff_patch current expected' test_done