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

Create gitattributes file specifying proper line endings #29733

Closed
tobiasdiez opened this issue May 25, 2020 · 19 comments
Closed

Create gitattributes file specifying proper line endings #29733

tobiasdiez opened this issue May 25, 2020 · 19 comments

Comments

@tobiasdiez
Copy link
Contributor

If you checkout sage on Windows, the line endings are wrong (depending on the core.autocrlf setting).

This PR adds a .gitattributes file which specifies the correct line ending so that simply cloning sage results in the correct line ending for all files. See the following documentation for more information
https://code.visualstudio.com/docs/remote/troubleshooting#_resolving-git-line-ending-issues-in-containers-resulting-in-many-modified-files

Component: build

Author: Tobias Diez

Branch: 1f027c9

Reviewer: Matthias Koeppe

Issue created by migration from https://trac.sagemath.org/ticket/29733

@mkoeppe
Copy link
Contributor

mkoeppe commented Jun 1, 2020

comment:2

Could you also take a look at the documentation that we have related to this in README.md? Does it need updating?

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jun 2, 2020

Branch pushed to git repo; I updated commit sha1. New commits:

aba4268Streamline readme based on changes

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jun 2, 2020

Changed commit from 4778e85 to aba4268

@tobiasdiez
Copy link
Contributor Author

comment:4

Good point. I've changed the readme accordingly.

(Btw, the documentation at https://doc.sagemath.org/html/en/developer/walk_through.html is not really reflecting some of the recent changes to the readme.)

@mkoeppe
Copy link
Contributor

mkoeppe commented Jun 2, 2020

comment:5

Thanks, I've opened #29784 for that.

@mkoeppe
Copy link
Contributor

mkoeppe commented Jun 2, 2020

comment:6

Replying to @tobiasdiez:

Good point. I've changed the readme accordingly.

I think it's better to keep the --branch master in the documentation -- so that it becomes clear for beginners how to select a different branch...

@tobiasdiez
Copy link
Contributor Author

comment:7

I probably miss something, but what's the purpose of the --branch master part? The clone command still fetches all branches so that changing a branch is a matter of git checkout <branch>. So why would you want to use the clone with a different branch?

But if you think it would be helpful, I'll readd this of course.

@mkoeppe
Copy link
Contributor

mkoeppe commented Jun 7, 2020

comment:8

Replying to @tobiasdiez:

I probably miss something, but what's the purpose of the --branch master part?

Of course it's redundant but by including it, it is more obvious to beginning users what to change to get the "develop" branch. At this point they do not necessarily know about git, and I don't think the README is a place to educate them about it. Think of a user who used to unpack tarballs but is taking a tiny step into the scary git world.

@mkoeppe
Copy link
Contributor

mkoeppe commented Jun 7, 2020

comment:9

In any case, removing it does not belong on this ticket.

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jun 7, 2020

Changed commit from aba4268 to 1f027c9

@sagetrac-git
Copy link
Mannequin

sagetrac-git mannequin commented Jun 7, 2020

Branch pushed to git repo; I updated commit sha1. New commits:

1f027c9Readd branch statement to clone

@tobiasdiez
Copy link
Contributor Author

comment:11

Ok, I've readded it.

@mkoeppe
Copy link
Contributor

mkoeppe commented Jun 7, 2020

Reviewer: Matthias Koeppe

@tobiasdiez
Copy link
Contributor Author

comment:13

Is there anything else to do from my side?

@fchapoton
Copy link
Contributor

comment:14

no, just be patient

@vbraun
Copy link
Member

vbraun commented Jul 8, 2020

Changed branch from u/gh-tobiasdiez/gitattributes to 1f027c9

@saraedum
Copy link
Member

saraedum commented Sep 3, 2020

Changed commit from 1f027c9 to none

@saraedum
Copy link
Member

saraedum commented Sep 3, 2020

comment:16

Could it be that this broke #30403?

@fchapoton
Copy link
Contributor

comment:17

and this is also breaking some of the gitlab workers, maybe ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

No branches or pull requests

5 participants