Skip to content

Avoid changing line endings of png and mmdb files #2200

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

Merged
merged 1 commit into from
Nov 7, 2022

Conversation

wilkinsona
Copy link
Member

Without this change, git status shows unexpected changes:

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:   spring-session-samples/spring-session-sample-boot-findbyusername/src/main/resources/GeoLite2-City.mmdb
	modified:   spring-session-samples/spring-session-sample-boot-findbyusername/src/main/resources/static/images/logo.png
	modified:   spring-session-samples/spring-session-sample-boot-hazelcast/src/main/resources/static/images/logo.png
	modified:   spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/static/images/logo.png
	modified:   spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/static/resources/img/logo.png
	modified:   spring-session-samples/spring-session-sample-boot-redis-json/src/main/resources/static/images/logo.png
	modified:   spring-session-samples/spring-session-sample-boot-redis/src/main/resources/static/images/logo.png
	modified:   spring-session-samples/spring-session-sample-boot-websocket/src/main/resources/static/images/logo.png

git diff revealed that it was related to line endings:

$ git diff

warning: CRLF will be replaced by LF in spring-session-samples/spring-session-sample-boot-findbyusername/src/main/resources/GeoLite2-City.mmdb.
The file will have its original line endings in your working directory
warning: CRLF will be replaced by LF in spring-session-samples/spring-session-sample-boot-findbyusername/src/main/resources/static/images/logo.png.
The file will have its original line endings in your working directory
warning: CRLF will be replaced by LF in spring-session-samples/spring-session-sample-boot-hazelcast/src/main/resources/static/images/logo.png.
The file will have its original line endings in your working directory
warning: CRLF will be replaced by LF in spring-session-samples/spring-session-sample-boot-jdbc/src/main/resources/static/images/logo.png.
The file will have its original line endings in your working directory
warning: CRLF will be replaced by LF in spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/static/resources/img/logo.png.
The file will have its original line endings in your working directory
warning: CRLF will be replaced by LF in spring-session-samples/spring-session-sample-boot-redis-json/src/main/resources/static/images/logo.png.
The file will have its original line endings in your working directory
warning: CRLF will be replaced by LF in spring-session-samples/spring-session-sample-boot-redis/src/main/resources/static/images/logo.png.
The file will have its original line endings in your working directory
warning: CRLF will be replaced by LF in spring-session-samples/spring-session-sample-boot-websocket/src/main/resources/static/images/logo.png.
The file will have its original line endings in your working directory

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage An issue we've not yet triaged label Nov 7, 2022
@rwinch rwinch self-assigned this Nov 7, 2022
@rwinch rwinch added in: build An issue in the build type: bug A general bug and removed status: waiting-for-triage An issue we've not yet triaged in: build An issue in the build labels Nov 7, 2022
@rwinch rwinch added this to the 3.0.0-RC2 milestone Nov 7, 2022
@rwinch rwinch merged commit d850762 into spring-projects:main Nov 7, 2022
@wilkinsona wilkinsona deleted the fix-git-attributes branch January 20, 2025 12:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
in: build An issue in the build type: bug A general bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants