Skip to content
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

Set core.autocrlf and core.eol for Git remotes #3882

Merged
merged 1 commit into from
Jun 26, 2019

Conversation

dra27
Copy link
Member

@dra27 dra27 commented Jun 24, 2019

This change ensures that Git always disables text file line-ending normalisation when cloning changes from a Git remote.

Separate (still to be done) work on the OpamLocal driver, opam admin, and opam lint code will ensure that hashes for text files are always initially computed using the repository normalisation. This differs from the approach of previous PRs which potentially hashed two versions of the file by determining from the git if the file needs transforming prior to the single hash being computed. The only time this transformation comes into play is if a Local (i.e. rsync) remote of a Git clone is added on a platform with core.autocrlf set to true (i.e. if you are working in a Git clone of a remote with core.autocrlf set to true)

@AltGr AltGr merged commit 7d2c102 into ocaml:master Jun 26, 2019
@dra27 dra27 deleted the git-normalisation branch June 26, 2019 16:29
@rjbou rjbou added this to the 2.1.0 milestone Jun 26, 2019
@dra27 dra27 mentioned this pull request Jun 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants