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

Ensure a consistent line-endings policy #1651

Merged
merged 1 commit into from
May 24, 2024
Merged

Conversation

ldrumm
Copy link
Contributor

@ldrumm ldrumm commented May 22, 2024

I just went to change one line in a file, then found out the whole file changed since it was committed differently to my local system, and we don't do normalisation yet. This fixes that.

Here we add a .gitattributes file at the top level with the policy * text=auto which roughly translates as files that git considers "text" are stored internally in history as LF and checked out according to local user preference (which might be CRLF on a certain person's Win32 box, for example).

In addition to the new .gitattributes, files that had CRLF line-endings in the history have been renormalized with git add --renormalize ..

This should make cross-platform development easier while respecting local configs.

When in Rome...

@ldrumm ldrumm requested a review from kbenzie May 22, 2024 16:26
@ldrumm ldrumm requested review from a team as code owners May 22, 2024 16:26
@github-actions github-actions bot added the level-zero L0 adapter specific issues label May 22, 2024
I just went to change one line in a file, then found out the whole file
changed since it was committed differently to my local system, and we
don't do normalisation yet. This fixes that.

Here we add a .gitattributes file at the top level with the policy
`* text=auto` which roughly translates as files that git considers
"text" are stored internally in history as LF and checked out according
to local user preference (which might be CRLF on a certain person's
Win32 box, for example).

In addition to the new .gitattributes, files that had CRLF line-endings
in the history have been renormalized with `git add --renormalize .`.

This should make cross-platform development easier while respecting
local configs.

When in Rome...
@ldrumm
Copy link
Contributor Author

ldrumm commented May 24, 2024

Since this is functionally NFC, but has the possibility to need rebasing several times would it be possible to please merge soon?

@kbenzie
Copy link
Contributor

kbenzie commented May 24, 2024

Since this is functionally NFC, but has the possibility to need rebasing several times would it be possible to please merge soon?

Yes, as soon as @oneapi-src/unified-runtime-level-zero-write review it.

Copy link
Contributor

@nrspruit nrspruit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for level zero

@kbenzie kbenzie merged commit 0a11fb4 into oneapi-src:main May 24, 2024
51 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
level-zero L0 adapter specific issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants