Re: Commit cce8d6fdb introduces file t/t5100/nul, git tree is now incompatible with Cygwin (and probably Windows)
From: Mark Levedahl <hidden>
Date: 2016-06-15 22:44:39
Johannes Schindelin wrote:
quoted
As a for instance of the troubles: git>git checkout -f origin/master Previous HEAD position was a2f5be5... Merge branch 'jk/maint-send-email-compose' into maint error: git-checkout-index: unable to create file t/t5100/nul (File exists) As this commit is part of the published master branch, I am not sure the correct resolution: leaving this commit in place means that any commit between it and a commit fixing this will always cause an error on Cygwin / Windows. Of course, it *is* on the published master branch.That's the case for all regressions: we do not rewrite history for them.
I understand that, and the reasons: however, as this leads to a long sequence of commits pointing to *illegal* trees, not just trees with bad code, a different policy might be in order here. Or, it might not.
As for the resolution, could you quickly try the 'my-next' branch of git://repo.or.cz/git/dscho.git?
I can check that branch out, but don't get very far in the tests:
*** t0004-unwritable.sh ***
* ok 1: setup
* FAIL 2: write-tree should notice unwritable repository
(
chmod a-w .git/objects
test_must_fail git write-tree
)
status=$?
chmod 775 .git/objects
(exit $status)
* FAIL 3: commit should notice unwritable repository
(
chmod a-w .git/objects
test_must_fail git commit -m second
)
status=$?
chmod 775 .git/objects
(exit $status)
* FAIL 4: update-index should notice unwritable repository
(
echo a >file &&
chmod a-w .git/objects
test_must_fail git update-index file
)
status=$?
chmod 775 .git/objects
(exit $status)
* FAIL 5: add should notice unwritable repository
(
echo b >file &&
chmod a-w .git/objects
test_must_fail git add file
)
status=$?
chmod 775 .git/objects
(exit $status)
* failed 4 among 5 test(s)
make[1]: *** [t0004-unwritable.sh] Error 1
make[1]: Leaving directory `/usr/src/dscho
make: *** [test] Error 2
I don't have access to a linux box today, so I can't manipulate master
to find if that branch with your patch would work right now.
Mark