From: Junio C Hamano Date: Fri, 18 Nov 2005 03:36:24 GMT Subject: Re: master has some toys Message-ID: <7vfypur5jb.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <437D2D14.5080205@gmail.com> John Benes writes: > Junio C Hamano wrote: > > I was able to compile master and pu on Cygwin without NO_MMAP=YesPlease > in the Cygwin section. However, the make test failed on the > binary-apply on both master and pu, output follows. > > Commit ID's used for testing: > refs/heads/master 4e1da85d7d0480b6d9973317da4f7a5aa603fcb5 > refs/heads/pu 3b4587eb3c549649af7e84659b4808003c34c2d3 Thanks. But the test result look suspicious for pu. $ git-ls-tree 3b4587eb t | grep t4103 outputs empty, so what you tested does not seem to be that commit. Anyway, the master is more important at this point. > make test barfing on master: > *** t4103-apply-binary.sh *** > * FAIL 7: check binary diff with replacement. > git-checkout master > git-apply --check --allow-binary-replacement BF.diff > * FAIL 8: check binary diff with replacement (copy). > git-checkout master > git-apply --check --allow-binary-replacement CF.diff > * FAIL 15: apply binary diff. > do_reset > git-apply --allow-binary-replacement --index BF.diff && > test -z "$(git-diff --name-status binary)" > * FAIL 16: apply binary diff (copy). > do_reset > git-apply --allow-binary-replacement --index CF.diff && > test -z "$(git-diff --name-status binary)" > * failed 4 among 16 test(s) > make[1]: *** [t4103-apply-binary.sh] Error 1 So it fails on these binary diffs with full index tests. Could you try running it like this? $ cd t $ sh ./t4103-apply-binary.sh -i -v If all things being equal, this will stop at the first failing test "* FAIL 7: ", and you will have trash/ directory under t/. $ cd trash $ ls -l I would first want to see if it was diff that failed or the apply. What does BF.diff contain?