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

enforce lf line ending for shim #545

Merged
merged 1 commit into from
Nov 21, 2023
Merged

enforce lf line ending for shim #545

merged 1 commit into from
Nov 21, 2023

Conversation

zkamvar
Copy link
Contributor

@zkamvar zkamvar commented Nov 21, 2023

This should avoid the situation we found on @klbarnes20's machine and confirmed on @froggleston's machine where Git is forcing CRLF line endings. Instead of having both set core.autocrlf=input, this .gitattributes file should enforce this file having lf line endings.

@klbarnes20, can you test this on your computer by cloning this branch:

git clone --branch lf-line-endings-shim https://github.com/carpentries/sandpaper

and then running this in R (inside the just-cloned repo)

stopifnot(tools::md5sum("inst/pkgdown/shim.R") == "230853fec984d1a0e5766d3da79f1cea")

@zkamvar
Copy link
Contributor Author

zkamvar commented Nov 21, 2023

I have confirmed with @klbarnes20 that this works!

@zkamvar zkamvar merged commit 0d87a88 into main Nov 21, 2023
10 of 11 checks passed
@zkamvar zkamvar deleted the lf-line-endings-shim branch November 21, 2023 18:22
@klbarnes20
Copy link
Contributor

Thanks @zkamvar!

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.

2 participants