Merge branch 'jn/fast-import-fix'

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index f64aa48d24f2f5704d07b9285c94ba983f7d92ac..05ec0628322ccc103343515feb70d27a9a0e6c76 100755 (executable)
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -77,14 +77,6 @@ test_expect_success 'apply binary patch' \
         tree1=`git write-tree` &&
         test "$tree1" = "$tree0"'
 
-q_to_nul() {
-       perl -pe 'y/Q/\000/'
-}
-
-nul_to_q() {
-       perl -pe 'y/\000/Q/'
-}
-
 test_expect_success 'diff --no-index with binary creation' '
        echo Q | q_to_nul >binary &&
        (: hide error code from diff, which just indicates differences