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.

Sign up for GitHub

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

Jump to bottom

Add .gitattributes #27615

Closed
wants to merge 2 commits into from
Closed

Add .gitattributes #27615

wants to merge 2 commits into from

Conversation

Goooler
Copy link
Contributor

@Goooler Goooler commented Aug 10, 2021

@pivotal-cla
Copy link

@Goooler Please sign the Contributor License Agreement!

Click here to manually synchronize the status of this Pull Request.

See the FAQ for frequently asked questions.

@pivotal-cla
Copy link

@Goooler Thank you for signing the Contributor License Agreement!

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Aug 10, 2021
@philwebb philwebb added type: task A general task and removed status: waiting-for-triage An issue we've not yet triaged labels Aug 17, 2021
@philwebb philwebb added this to the 2.4.x milestone Aug 17, 2021
@wilkinsona
Copy link
Member

I think we need to tread carefully here. CI currently uses core.autocrlf=true:

spring-boot/ci/pipeline.yml

Lines 127 to 129 in 8966b13

git_config:
- name: core.autocrlf
value: true

I'm not sure how this change will interact with that configuration.

@philwebb philwebb added the status: on-hold We can't start working on this issue yet label Aug 17, 2021
@Goooler
Copy link
Contributor Author

Goooler commented Aug 17, 2021

I think we need to tread carefully here. CI currently uses core.autocrlf=true:

spring-boot/ci/pipeline.yml

Lines 127 to 129 in 8966b13

git_config:
- name: core.autocrlf
value: true

I'm not sure how this change will interact with that configuration.

.gitattributes should just effect files when commiting.

@philwebb
Copy link
Member

https://git-scm.com/docs/gitattributes#_checking_out_and_checking_in seems to suggest they also change checked out files.

@Goooler
Copy link
Contributor Author

Goooler commented Aug 17, 2021

If we should run CI for test once ?

@snicoll snicoll added the for: team-meeting An issue we'd like to discuss as a team to make progress label Oct 21, 2021
@philwebb philwebb removed status: on-hold We can't start working on this issue yet for: team-meeting An issue we'd like to discuss as a team to make progress labels Oct 25, 2021
snicoll pushed a commit to snicoll/spring-boot that referenced this pull request Oct 28, 2021
@Goooler @snicoll
Add .gitattributes
cb6bee0 
See spring-projectsgh-27615
snicoll added a commit to snicoll/spring-boot that referenced this pull request Oct 28, 2021
@snicoll
Polish "Add .gitattributes"
9691be1 
See spring-projectsgh-27615
snicoll added a commit to snicoll/spring-boot that referenced this pull request Oct 28, 2021
@snicoll
Harmonize line endings
db012cf 
See spring-projectsgh-27615
@snicoll snicoll self-assigned this Oct 28, 2021
@snicoll snicoll modified the milestones: 2.4.x, 2.4.13 Oct 28, 2021
@snicoll snicoll mentioned this pull request Oct 28, 2021
Closed
snicoll pushed a commit that referenced this pull request Oct 28, 2021
@Goooler @snicoll
Add .gitattributes
8c2dd7c 
See gh-27615
snicoll added a commit that referenced this pull request Oct 28, 2021
@snicoll
Polish "Add .gitattributes"
497d68a 
See gh-27615
@snicoll snicoll closed this in bcb0d83 Oct 28, 2021
snicoll added a commit that referenced this pull request Oct 28, 2021
@snicoll
Harmonize line endings
1b3f52d 
See gh-27615
@snicoll snicoll mentioned this pull request Oct 28, 2021
Closed
@snicoll snicoll removed this from the 2.4.13 milestone Oct 28, 2021
@snicoll snicoll added the status: superseded An issue that has been superseded by another label Oct 28, 2021
@snicoll
Copy link
Member

snicoll commented Oct 28, 2021

Unfortunately we need to revert this change for now, see #28476 for follow-up

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@snicoll snicoll

Labels
status: superseded An issue that has been superseded by another type: task A general task
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Goooler @pivotal-cla @wilkinsona @philwebb @snicoll @spring-projects-issues