-
Notifications
You must be signed in to change notification settings - Fork 418
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Commit the html files with the right line-ends #2045
Conversation
Sorry for the late response @fridrich, this dropped off my inbox horizon... I remember doing something similar recently after feedback from @deining; and I am guessing that perhaps the latest 4.7.4 release has undone my manual changes. I build releases on Windows.
My understanding is that this configuration should cause git to convert any CRLF line endings to LF before committing, so that the Looking at this StackOverflow answer, and the linked article, it is also possible that your git configuration for You can run Next, the article has some details on what happens when git writes to the object database and to the working directory. You can run Can you take a look at this, try the above and let me know your findings? |
Hi @fridrich have you had a chance to look at my previous comment? I'm curious to your feedback. |
I mean that configuration converts the files every time git is invoked. Just those files under version control have CRLF line endings. It is needed to commit them then with the new LF line ending. If they are not committed, they will always be uncommitted changes in the git repository. Even if you do git reset --hard |
Hi @fridrich I merged your PR, thank you! I also just did a release (4.7.5), so many HTML files were generated from the Asciidoc files again. |
Just gave it a try, and everything is fine! Seems like this issue is resolved eventually! Thanks to all for their efforts! |
@deining Thank you for checking! |
Every time git touches the repository, the CRLF->LF conversion is done. There are still html files in docs that have the wrong line-end. So every time one does for instance "git pull", there are local uncommitted changes. This pull request simply pushes the html files after the conversion, so that they have the right line-endings and so that there are not local changes generated every time.