Mark, I’ve just had confirmation from a Github expert that our configuration is correct, and the only way this can happen is if your local copy is somehow not completely in sync with the repo - which is the only way your local config could override our repository configuration.
Can I ask you to please completely delete your private fork and your local git repo for rdf4j, and fork/check out fresh and new. If there’s any un-pushed work you wish to save at this point, let me know which branches and I will create copies of them in the central repo.
It might also be good if you could execute the following (do this before you check out the new local copy):
git config --global core.autocrlf true
This configures Git on Windows to properly handle line ending conversion (shouldn’t be necessary given our .gitattributes, but…).
Let’s get this problem fixed.
Jeen
This is an annoyance more than a critical issue, but after the latest merge I have yet again had to commit line ending conversions in several new source files, which somehow got committed with DOS line endings instead of UNIX.
I am not entirely sure how this can even happen, given that I thought we had configured Git such that it automatically converts everything to UNIX line endings upon checkin, but it does keep happening. It seems to affect your commits in particular Mark - I’m not sure whether that is because you are the only dev on Windows, or whether there is something wrong in your setup, specifically.
Or perhaps it’s my own setup - does anybody else have Git reporting line-ending-only local changes if you check out commit a3cd98e?
I’d also be grateful if anyone with more expertise on git configuration could take a look at our .gitattributes config file and tell me where the mistake is.
Relevant links:
Thanks,
Jeen
|
