From: Junio C Hamano <hidden> Date: 2016-06-15 22:42:12
Alex Riesen [off-list ref] writes:
As it turned out, not the git.c is guilty, but the missing
NO_MMAP=YesPlease in Cygwin section. I had it for a long time and
accidentally removed by the recent pull. BTW, I couldn't find nowhere
on original branch. Was it never submitted?
Neither 'git-whatchanged Makefile' nor 'git-whatchanged
-SNO_MMAP Makefile' reports such on my end. Do we need one?
Johannes said he tests on Cygwin as well, and I am sure there
are others with Cygin on the list. Help us out here please?
From: John Benes <hidden> Date: 2016-06-15 22:42:12
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Junio C Hamano wrote:
Alex Riesen [off-list ref] writes:
quoted
As it turned out, not the git.c is guilty, but the missing
NO_MMAP=YesPlease in Cygwin section. I had it for a long time and
accidentally removed by the recent pull. BTW, I couldn't find nowhere
on original branch. Was it never submitted?
Neither 'git-whatchanged Makefile' nor 'git-whatchanged
-SNO_MMAP Makefile' reports such on my end. Do we need one?
The patch with the commented out option seems like it would work...
Johannes said he tests on Cygwin as well, and I am sure there
are others with Cygin on the list. Help us out here please?
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
make test barfing on master:
*** t4103-apply-binary.sh ***
* ok 1: stat binary diff -- should not fail.
* ok 2: stat binary diff (copy) -- should not fail.
* ok 3: check binary diff -- should fail.
* ok 4: check binary diff (copy) -- should fail.
* ok 5: check incomplete binary diff with replacement -- should fail.
* ok 6: check incomplete binary diff with replacement (copy) -- should
fail.
* 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
* ok 9: apply binary diff -- should fail.
* ok 10: apply binary diff -- should fail.
* ok 11: apply binary diff (copy) -- should fail.
* ok 12: apply binary diff (copy) -- should fail.
* ok 13: apply binary diff without replacement -- should fail.
* ok 14: apply binary diff without replacement (copy) -- should fail.
* 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
make test barfing on pu:
*** t4103-apply-binary.sh ***
usage: git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-r]
[--root] [<co
mmon diff options>] <tree-ish> [<tree-ish>] [<path>...]
***SNIP***
usage: git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-r]
[--root] [<co
mmon diff options>] <tree-ish> [<tree-ish>] [<path>...]
***SNIP***
* FAIL 1: stat binary diff -- should not fail.
git-checkout master
git-apply --stat --summary B.diff
* FAIL 2: stat binary diff (copy) -- should not fail.
git-checkout master
git-apply --stat --summary C.diff
* ok 3: check binary diff -- should fail.
* ok 4: check binary diff (copy) -- should fail.
* ok 5: check incomplete binary diff with replacement -- should fail.
* ok 6: check incomplete binary diff with replacement (copy) -- should
fail.
* 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
* ok 9: apply binary diff -- should fail.
* ok 10: apply binary diff -- should fail.
* ok 11: apply binary diff (copy) -- should fail.
* ok 12: apply binary diff (copy) -- should fail.
* ok 13: apply binary diff without replacement -- should fail.
* ok 14: apply binary diff without replacement (copy) -- should fail.
* 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 6 among 16 test(s)
make[1]: *** [t4103-apply-binary.sh] Error 1
- --
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
iQIVAwUBQ30tE2F0oWcU9kCNAQKzRQ/8DEoZTRYDcU80mzddq8AS8ClctLx8CorY
OJYY/sTAivjot7R/bPUj97Ie+FaUKC0mpTOGZTT8KkSpRg2mbZ6YlTUoHAtf4iq3
F9vQs2qVJqyUJqbXcP+X68huIZF7vHZI47e9ExTO1RrxZCGxDp8JigfhmlS4CN4K
Dee1NSMnoWGklNEXvZMwkvhLerV+9Xs6UTGZ5AeRHRiHiLqK+I9eDNaULABHwAYO
JSsat0HDjKMKrgNNFo43TpRTm17gq7N83LOJJkxiNYnRPh8nGpIOgfNx8riWP5DB
tMw3FWvA9bv3tllvTFC4wx92Rgfs255cvXEunqfRTsMzGG7rhdg4UY92I0yB8k6b
g6nucu93VtwEkHZ1b9ZTBwz85ZuTImS/72pHbRPvOaeSuDArBI9i+Lwrb+z+0vUS
iMMuAxtWhKUFr87A6ljdu27IfE+pJaEgGEySGkquU3EexuNRMz62raveRsEpLSu8
iqbKoMeC1A7CtcbV3OBdktfFyM3rR8/G9OpjBNdkojo08BOvsoMCU45jLdXFIFtu
MGMajhGEu8EwAdItq6Qq0fXOfU6ph5oN4tg1pKt83QDkDFJyEJzOH1CMLh+qxXR3
m25wLSJcV8YbNfQVMumw2aFXn3ojwkP3kEheoTKexTFVkwGS0dU/j9kpQ8wj9Pqv
1ttxTdlX2HM=
=OthK
-----END PGP SIGNATURE-----
From: Johannes Schindelin <hidden> Date: 2016-06-15 22:42:12
Hi,
On Thu, 17 Nov 2005, John Benes 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.
Nobody doubts that you can *compile* it. The problem is the fixing of the
mmap()ed regions after fork(). Since win32 is such a sane system, it does
not provide mmap() or fork() out of the box. And under some very obscure
circumstances, cygwin's emulation of mmap() and fork() fails.
BTW, it would be more helpful if you do not just tell *what* test fails,
but *how*. For example, try to run "git-whatchanged -p" and send just
the first page of the output (both stdout and stderr). I bet it says it
has a problem fixing up mmap() after fork().
Hth,
Dscho
From: John Benes <hidden> Date: 2016-06-15 22:42:12
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Johannes Schindelin wrote:
BTW, it would be more helpful if you do not just tell *what* test fails,
but *how*. For example, try to run "git-whatchanged -p" and send just
the first page of the output (both stdout and stderr). I bet it says it
has a problem fixing up mmap() after fork().
I ran "git-whatchanged -p" with the previously mentioned master build
installed in /usr/bin. Below is a copy of the command session.
Stdout was redirected to test2.txt, which is located at:
http://www.penguinlounge.1and2.org/videos/test2.txt.bz2
Twinkie@squirrel ~/git
$ git-whatchanged -p > ../test2.txt
Twinkie@squirrel ~/git
$ cd ..
Twinkie@squirrel ~
$ ls -la test2.txt
- -rw-r--r-- 1 Twinkie None 9338905 Nov 17 21:23 test2.txt
nothing was displayed on stderr.
The make test error was shown on linux too. [1]
It reports as:
Twinkie@squirrel ~/git/t/trash
$ git-apply --check --allow-binary-replacement BF.diff
fatal: patch with only garbage at line 30
could it be an outdated diff? (2.8.7)
[1] Re: "make test" fails with current HEAD @ 9:23PM CST by A Large
Angry SCM
Anything else you want me to bash this Cygwin install against?
- --
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
iQIVAwUBQ31SF2F0oWcU9kCNAQKLUxAAtqOpSCsGSnNz+q9x8gzqaqjCK+mjjUkJ
YJFalTEeNO9/alp3mPGb4kXwhMahyugGqHZzr2Lp5JC0gDSsn5vqF2sxYtB9yvAg
1lg33awy5AI1LkIcbeiCvjkBI83UvIjOYLEs1YcIXKRDYJkcbo6yBN4uqkDZKAoS
O8L3q2r2/mCJQYlANy1ruhT0Al5xPwTFNv6JqIkm8PWsPE+es6ZwyFBXKi62CHu5
AWsc2nHDhPIx5YS1h7CIIQjiRh2qkf807IvXKZtY++o7yoHn49Rtu87VblZhkuH5
UHOSE0gDbT37MbIg6hoZc20kBZIq1s+6e+/FhrFAUrmnny9t7fPaU35gJmPPA63W
KajRKOwChmO6V5scTfgimxxzN4Jlnd+AM8FdxTWCfz6s4FLnnzukwX5T4PbWw6Kg
if8fekhKkPYCLQtAa8Q6Xe5GIZJ5ghVRfAnZWhc4p8OJj6gacwGCk/QX0Rxu6z3r
BF9e7RCyytwDw2Lw87NJFc7AYp4V4uINOAMMxPK0eidHOkkVVzu3eaoB8OIVzh5Q
oAwo+gPpd/PgFldJJu4i9e8bD8/J7cwZ0vpMkRDig9P1ZqFCj9t2+bAVzOgJPb80
4YG/UR4VwVuKyYDeLhCHNLYJBssNXCCkN4+UKuLcNsk6+pXzniPVAc2Wda5BMIj2
LV5oMRUCpKQ=
=NFuc
-----END PGP SIGNATURE-----