Skip to content

Normalize EOLs#6682

Merged
deivid-rodriguez merged 1 commit intomainfrom
deivid-rodriguez/remove-part-of-gitattributes
Feb 16, 2023
Merged

Normalize EOLs#6682
deivid-rodriguez merged 1 commit intomainfrom
deivid-rodriguez/remove-part-of-gitattributes

Conversation

@deivid-rodriguez
Copy link
Copy Markdown
Contributor

Since #5731, checking out our repo with the default git configuration ends up with source control changes to convert EOLs of a single file:

$ GIT_CONFIG_NOSYSTEM=1 GIT_CONFIG_GLOBAL=/dev/null gh repo clone dependabot/dependabot-core foo
Cloning into 'foo'...
remote: Enumerating objects: 139226, done.
remote: Counting objects: 100% (334/334), done.
remote: Compressing objects: 100% (233/233), done.
remote: Total 139226 (delta 133), reused 251 (delta 86), pack-reused 138892
Receiving objects: 100% (139226/139226), 67.98 MiB | 20.97 MiB/s, done.
Resolving deltas: 100% (93111/93111), done.

$ git -C foo status
On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
	modified:   nuget/spec/fixtures/nuspecs/Microsoft.Extensions.DependencyModel.nuspec

no changes added to commit (use "git add" and/or "git commit -a")

This particular file was introduced at 67baa35, but I don't see anything in that commit that suggests dos-style EOLs are relevant.

So I'm normalizing this file and removing the special case from our .gitattributes file.

@deivid-rodriguez deivid-rodriguez marked this pull request as ready for review February 16, 2023 13:00
@deivid-rodriguez deivid-rodriguez requested a review from a team as a code owner February 16, 2023 13:00
@deivid-rodriguez deivid-rodriguez merged commit b7ff859 into main Feb 16, 2023
@deivid-rodriguez deivid-rodriguez deleted the deivid-rodriguez/remove-part-of-gitattributes branch February 16, 2023 13:32
alcere pushed a commit that referenced this pull request Feb 20, 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.

2 participants