convert report_path_error to take struct pathspec

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 7b0e759c74bac0fbff2a4bd7ec4c6f92df70e2c0..1215ae544b6915fe2cc6df4d193c8f3a805beba1 100755 (executable)
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -63,31 +63,19 @@ test_expect_success 'apply --numstat understands diff --binary format' '
 
 # apply needs to be able to skip the binary material correctly
 # in order to report the line number of a corrupt patch.
-test_expect_success 'apply detecting corrupt patch correctly' '
+test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
        git diff >output &&
        sed -e "s/-CIT/xCIT/" <output >broken &&
-       if git apply --stat --summary broken 2>detected
-       then
-               echo unhappy - should have detected an error
-               (exit 1)
-       else
-               echo happy
-       fi &&
+       test_must_fail git apply --stat --summary broken 2>detected &&
        detected=`cat detected` &&
        detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
        detected=`sed -ne "${detected}p" broken` &&
        test "$detected" = xCIT
 '
 
-test_expect_success 'apply detecting corrupt patch correctly' '
+test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
        git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
-       if git apply --stat --summary broken 2>detected
-       then
-               echo unhappy - should have detected an error
-               (exit 1)
-       else
-               echo happy
-       fi &&
+       test_must_fail git apply --stat --summary broken 2>detected &&
        detected=`cat detected` &&
        detected=`expr "$detected" : "fatal.*at line \\([0-9]*\\)\$"` &&
        detected=`sed -ne "${detected}p" broken` &&
@@ -131,7 +119,7 @@ cat >expect <<EOF
 EOF
 
 test_expect_success 'diff --stat with binary files and big change count' '
-       echo X | dd of=binfile bs=1k seek=1 &&
+       printf "\01\00%1024d" 1 >binfile &&
        git add binfile &&
        i=0 &&
        while test $i -lt 10000; do