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

Amulet pal file added in PR #3078 breaks git on mac #3085

Closed
grunt-lucas opened this issue Jun 27, 2023 · 4 comments
Closed

Amulet pal file added in PR #3078 breaks git on mac #3085

grunt-lucas opened this issue Jun 27, 2023 · 4 comments
Labels
bug Bug status: confirmed This bug has been confirmed to exist in the codebase

Comments

@grunt-lucas
Copy link

Description

I tested on two different mac laptops. Clone a clean pokeemerald repo. Run git checkout upcoming. You will have an unclean index with the following change:

On branch upcoming
Your branch is up to date with 'origin/upcoming'.

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:   graphics/items/icon_palettes/clear_amulet.pal

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

It is impossible to clear this change. You can't stash it. You can't restore it. Git will not allow you to checkout any other branches either since there are local changes present.

I am not sure what is going on. I thought it might be a platform-specific line endings thing, but I have never had this error with other pal files. And I see the expansion has *.pal text eol=crlf defined in .gitattributes so that should be handling things.

Version

upcoming (Edge)

Upcoming Version

a44af6f

Discord contact info

lucas7562

@grunt-lucas grunt-lucas added bug Bug status: unconfirmed This bug has not been reproduced yet labels Jun 27, 2023
@AsparagusEduardo
Copy link
Collaborator

I think it was because it was added via GitHub upload. I found something similar happening with the issue template files.

@AsparagusEduardo AsparagusEduardo added status: confirmed This bug has been confirmed to exist in the codebase and removed status: unconfirmed This bug has not been reproduced yet labels Jun 28, 2023
@AsparagusEduardo
Copy link
Collaborator

It does happen in WSL as well btw. Please let me know if this commit fixes the issue:
AsparagusEduardo@9db1230

@grunt-lucas
Copy link
Author

I wanted to note for anyone who can't get rid of the change in their staging area:

git rm --cached -r .
git reset --hard

should revert your staging area and clear the changes.

@grunt-lucas
Copy link
Author

grunt-lucas commented Jun 28, 2023

Fixed by PR #3806

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Bug status: confirmed This bug has been confirmed to exist in the codebase
Projects
None yet
Development

No branches or pull requests

2 participants