From: John Benes Date: Fri, 18 Nov 2005 04:01:29 GMT Subject: Re: master has some toys Message-ID: <437D5219.6060300@gmail.com> In-Reply-To: <7vfypur5jb.fsf@assigned-by-dhcp.cox.net> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Junio C Hamano wrote: > John Benes writes: >> Commit ID's used for testing: >> refs/heads/master 4e1da85d7d0480b6d9973317da4f7a5aa603fcb5 >> refs/heads/pu 3b4587eb3c549649af7e84659b4808003c34c2d3 > > Thanks. But the test result look suspicious for pu. I verified that I was testing that commit, and the ls-tree results. Must have been left over after switching from master... > Anyway, the master is more important at this point. > 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? > Output from the commands requested: Twinkie@squirrel ~/git/t $ sh ./t4103-apply-binary.sh -i -v sh ./t4103-apply-binary.sh -i -v * expecting success: git-checkout master git-apply --stat --summary B.diff file1 | 4 ++-- file2 | 5 ----- file3 | 0 file4 | 0 4 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 file2 create mode 100644 file3 * ok 1: stat binary diff -- should not fail. * expecting success: git-checkout master git-apply --stat --summary C.diff file1 | 4 ++-- file2 | 5 ----- file3 | 0 file4 | 0 4 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 file2 copy file1 => file3 (70%) * ok 2: stat binary diff (copy) -- should not fail. * expecting failure: git-checkout master git-apply --check B.diff fatal: patch with only garbage at line 30 * ok 3: check binary diff -- should fail. * expecting failure: git-checkout master git-apply --check C.diff fatal: patch with only garbage at line 32 * ok 4: check binary diff (copy) -- should fail. * expecting failure: git-checkout master git-apply --check --allow-binary-replacement B.diff fatal: patch with only garbage at line 30 * ok 5: check incomplete binary diff with replacement -- should fail. * expecting failure: git-checkout master git-apply --check --allow-binary-replacement C.diff fatal: patch with only garbage at line 32 * ok 6: check incomplete binary diff with replacement (copy) -- should fail. * expecting success: git-checkout master git-apply --check --allow-binary-replacement BF.diff fatal: patch with only garbage at line 30 * FAIL 7: check binary diff with replacement. git-checkout master git-apply --check --allow-binary-replacement BF.diff Twinkie@squirrel ~/git/t $ cd trash cd trash Twinkie@squirrel ~/git/t/trash $ ls -l ls -l total 19 - -rw-r--r-- 1 Twinkie None 909 Nov 17 21:49 B.diff - -rw-r--r-- 1 Twinkie None 1173 Nov 17 21:49 BF.diff - -rw-r--r-- 1 Twinkie None 944 Nov 17 21:49 C.diff - -rw-r--r-- 1 Twinkie None 1208 Nov 17 21:49 CF.diff - -rw-r--r-- 1 Twinkie None 201 Nov 17 21:49 file1 - -rw-r--r-- 1 Twinkie None 201 Nov 17 21:49 file2 - -rw-r--r-- 1 Twinkie None 201 Nov 17 21:49 file4 Twinkie@squirrel ~/git/t/trash $ cat BF.diff cat BF.diff diff --git a/file1 b/file1 index edc575dec543a684da5007b43886ee32ecb381ae..af1eedd35be991f3ced320f7d927799c 72cd8435 100644 - --- a/file1 +++ b/file1 @@ -1,5 +1,5 @@ - -A quick brown fox jumps over the lazy dog. +A quick brown fov jumps over the lazy dog. A tiny little penguin runs around in circles. - -There is a flag with Linux written on it. +There is a flag with Linuv written on it. A slow black-and-white panda just sits there, munching on his bamboo. diff --git a/file2 b/file2 deleted file mode 100644 index edc575dec543a684da5007b43886ee32ecb381ae..00000000000000000000000000000000 00000000 - --- a/file2 +++ /dev/null @@ -1,5 +0,0 @@ - -A quick brown fox jumps over the lazy dog. - -A tiny little penguin runs around in circles. - -There is a flag with Linux written on it. - -A slow black-and-white panda just sits there, - -munching on his bamboo. diff --git a/file3 b/file3 new file mode 100644 index 0000000000000000000000000000000000000000..adb07b7ad3fa2c63251b06d1d39cb90a 85b860b4 Files /dev/null and b/file3 differ diff --git a/file4 b/file4 index edc575dec543a684da5007b43886ee32ecb381ae..adb07b7ad3fa2c63251b06d1d39cb90a 85b860b4 100644 Files a/file4 and b/file4 differ Twinkie@squirrel ~/git/t/trash $ git-apply BF.diff fatal: patch with only garbage at line 30 - -- John Benes GPG Fingerprint: D519 25DB BB5C 38FC 9D02 02E7 596D BC50 F880 27FA "It is not only the living who are killed in war." - Isaac Asimov -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iQIVAwUBQ31SGGF0oWcU9kCNAQJmchAA0L9fnTvMNwYhDHRVdPyF6XQYJJ7j3s6M CtcjFvQZ0Zo2tp3ZZ8mqv9ANgPkV80HZFpWPwmlAouFQfNbjvEDlFxLejaKZ5TJj q068iMk8ZmUUHKPUhONhCsi/toXHQuhA7RMWEwtE9EeugOOIC/++eI8qhKzBhJr3 REzLQN55lqrdhN/6ksrhJQU2VQ3AcAukgezrJy3j8CYOId3pVLYoyD75oxTrelnN xSPritxM/zkdQZYwx/WeSFRivQQZgiSwm2nREJ5NY5MJ8X5SIZJ+bcHSnndNmUYv e6YkZRPLXQBAyJpQHwmAQIqtYikPZ/Q6SNBoiQgA3Ws1SyzSaMcOo9R30Cg4LT4i 37EtQwjrGXzY6V/YlHbPqauPlUW6Sosc7fadNXHXkJJrdgyGSATZghh+XEZpNQ1G 2cS05y7/Xu9KnhL0GxbwLf9FZg14CndRh04NDtkdvwyE5rK9SCD5seW6HQOeBcuX oHLPeA29IaZvHFUYTITXP5p2ZySAXrrFt7R532j6njeJvVCRzV7pPh7msHmAgdXL Wz5Xv9ED43wz+q6JpXuWloYNyDKUUil2emXVA/MHwLW9ugfZmu9/OVo2ChXf+ZLH 8pSGxRmxTAVSf0GIiODPMWmGrm2zsKbNczCY1wATjiRaYvlmRk1kiXpXpubW5bw9 F1UDCLIFaJk= =Uh0t -----END PGP SIGNATURE-----