Skip to content

Convert line endings from CRLF to LF #263

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

Merged
merged 1 commit into from
Dec 4, 2024

Conversation

trxcllnt
Copy link
Member

@trxcllnt trxcllnt commented Dec 4, 2024

Fix an issue where git shows modifications immediately after cloning in Linux.

According to this, anybody committing from Windows should either:

  • configure their editor to use LF and set git config --global core.autocrlf false
  • keep using CRLF in editors, and set git config --global core.autocrlf true

@leofang
Copy link
Member

leofang commented Dec 4, 2024

/ok to test

@leofang leofang added support All things related to the project that can't be categorized P0 High priority - Must do! labels Dec 4, 2024
@leofang
Copy link
Member

leofang commented Dec 4, 2024

cc @ksimpson-work

Thanks, Paul! Confirmed locally that this is the only actual change

$ git diff main  -w
diff --git a/.gitattributes b/.gitattributes
index 00407cd..aeb3200 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,3 +5,5 @@ cuda/_version.py export-subst
 # we do not own any headers checked in, don't touch them
 *.h binary
 *.hpp binary
+# git should not convert line endings in PNG files
+*.png binary

@leofang
Copy link
Member

leofang commented Dec 4, 2024

anybody committing from Windows should either:

yes, xref: #201 (review)

@leofang leofang merged commit 28e8003 into NVIDIA:main Dec 4, 2024
1 check passed
@trxcllnt trxcllnt deleted the fix-line-endings branch December 4, 2024 20:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
P0 High priority - Must do! support All things related to the project that can't be categorized
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants