X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4012-diff-binary.sh;h=b8ec6e90afb970b1b2540e30901b2f058522544e;hb=c4275591fbb7d582c397b228e38dbb8419c89330;hp=eced1f30fb8475739aef52230bbb79946a0f76d8;hpb=77ad7a49d3cc946487ca759e5361effbcfb03be5;p=git.git diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index eced1f30f..b8ec6e90a 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' @@ -61,7 +61,7 @@ test_expect_success 'apply detecting corrupt patch correctly' \ detected=`sed -ne "${detected}p" broken` && test "$detected" = xCIT' -test_expect_success 'initial commit' 'git-commit -a -m initial' +test_expect_success 'initial commit' 'git commit -a -m initial' # Try removal (b), modification (d), and creation (e). test_expect_success 'diff-index with --binary' \ @@ -72,7 +72,7 @@ test_expect_success 'diff-index with --binary' \ git apply --stat --summary current' test_expect_success 'apply binary patch' \ - 'git-reset --hard && + 'git reset --hard && git apply --binary --index