Hi, Johannes Sixt wrote: > From: Johannes Sixt <j6t@xxxxxxxx> > > For some reason, 'echo X | dd bs=1k seek=1' creates a file with 2050 bytes > on Windows instead of the expected 1026 bytes, so that a test fails. Since > the actual contents of the file are irrelevant as long as there is at > least one zero byte so that the diff machinery recognizes it as binary, > use printf to generate it. > > Signed-off-by: Johannes Sixt <j6t@xxxxxxxx> > --- > While the focus is on t4012, maybe you can add this patch to the series. Your patch looks good to me and works here. If I hear no objections I will include it as number 7 when resending this series. Alexander > t/t4012-diff-binary.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh > index 6cebb39..8c018ab 100755 > --- a/t/t4012-diff-binary.sh > +++ b/t/t4012-diff-binary.sh > @@ -125,7 +125,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 > -- > 1.7.11.1.1304.g11834c6 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html