X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4012-diff-binary.sh;h=3cf5b5c4ea05d861d75aa146a52d7d273dcaa4cb;hb=f8c62880ef22b74ea6df47bb349ff0743d2a93f9;hp=eac12712dbcf7a9f59c6c8ae0e5772b19662ab8a;hpb=718258e256b74622aa55f5ee0cb9cff4cce6bf9f;p=git.git diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index eac12712d..3cf5b5c4e 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -12,7 +12,7 @@ test_expect_success 'prepare repository' \ 'echo AIT >a && echo BIT >b && echo CIT >c && echo DIT >d && git update-index --add a b c d && echo git >a && - cat ../test4012.png >b && + cat "$TEST_DIRECTORY"/test4012.png >b && echo git >c && cat b b >d' @@ -25,11 +25,11 @@ cat > expected <<\EOF EOF test_expect_success 'diff without --binary' \ 'git diff | git apply --stat --summary >current && - cmp current expected' + test_cmp expected current' test_expect_success 'diff with --binary' \ 'git diff --binary | git apply --stat --summary >current && - cmp current expected' + test_cmp expected current' # apply needs to be able to skip the binary material correctly # in order to report the line number of a corrupt patch.