Merge branch 'maint'

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index eac12712dbcf7a9f59c6c8ae0e5772b19662ab8a..421f4bba3fbc666cf2ab7ec4289f10d29d61eebb 100755 (executable)
--- 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'