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

eol normalization with CRLF => LF in all files #802

Merged
merged 2 commits into from
Jul 12, 2023

Conversation

ebozduman
Copy link
Collaborator

@ebozduman ebozduman commented Jul 10, 2023

Replaces all CRLF with LF character in all files.
This cleanup is required as a first step to clean up the master.

@ebozduman
Copy link
Collaborator Author

@martijn00

lint complains about the mismatch between the following files and .editorconfig.
I guess this is due to the .gitattribute change this PR brings, text=lf to resolve CRLF => LF issue.

!!!! Process Aborted !!!!
The following files do not match .editorconfig:
 * Directory.Build.props
 * FileUploader/FileUpload.cs
 * Minio.Examples/Cases/AWSEnvironmentProviderExample.cs
 *  ... and all Minio.Examples/Cases files
 : 
 :

Can we relax .editorconfig to let these files pass the lint check so that we can replace CRLF with LF eol character?Later, we can put them all back together with .gitattribute setting text=auto.

@martijn00
Copy link
Contributor

I'm not sure what you plan to do... Why not just force push the correct line endings to master?

Here you can find the editorconfig line: https://github.com/minio/minio-dotnet/blob/master/.editorconfig#L11

@ebozduman
Copy link
Collaborator Author

ebozduman commented Jul 12, 2023

I'm not sure what you plan to do... Why not just force push the correct line endings to master?

@martijn00

That's exactly what I am trying to do.
There is an issue with text=auto in .gitattribute file. The git add command, which is run to stage the modified files, does the opposite and unmarks the modified files causing nothing to be staged.
So, this PR is equivalent to forcing lf as the eol character in all files.

@martijn00
Copy link
Contributor

But why revert my PR then? Why not just force it into the master branch?

@ebozduman ebozduman changed the title eol normalization: revert back PR798 eol normalization with CRLF => LF in all files Jul 12, 2023
@ebozduman
Copy link
Collaborator Author

But why revert my PR then? Why not just force it into the master branch?

@martijn00

You are right. That is wrong in the title and in the description.
So, I did not revert the PR798.
The only change in the .gitattribute file is this:

* text=auto eol=lf  =>  * text=lf

I will remove the references to PR798 in the title and in the description.

@harshavardhana harshavardhana merged commit 376872d into minio:master Jul 12, 2023
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.

4 participants