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

Update gitattributes to fix #458

Closed
rbjaxter opened this issue Oct 4, 2023 · 5 comments
Closed

Update gitattributes to fix #458

rbjaxter opened this issue Oct 4, 2023 · 5 comments
Labels
Cannot Fix Feature / Improvement Need Help Used for issues that I'm struggling to resolve. Help's appreciated if you have potential solutions!

Comments

@rbjaxter
Copy link
Owner

rbjaxter commented Oct 4, 2023

resource/chat_*.txt diff working-tree-encoding=UTF-16LE
resource/closecaption_/clovervidia*.txt diff working-tree-encoding=UTF-16LE
may need to add eol=CRLF to the end as well

or honestly just *.txt working-tree-encoding=UTF-8 should cause no harm

I was kinda fed up trying to deal with the encoding issues before but I should probably fix it so they're processed properly

@rbjaxter
Copy link
Owner Author

rbjaxter commented Oct 4, 2023

somehow I was so lost in the sauce that I left in a custom merge driver. it doesn't cause any harm, but I'll need to remove that as well

@rbjaxter rbjaxter added Feature / Improvement Need Help Used for issues that I'm struggling to resolve. Help's appreciated if you have potential solutions! labels Oct 4, 2023
@rbjaxter
Copy link
Owner Author

rbjaxter commented Oct 6, 2023

I need someone smarter than me to figure out if there's a way to make these files not binary and show up with diffs. Working tree encoding seems to work when the directory is renormalized, but any time I make a change to these chat_ files it swaps back to binary.

VSCode encoding is set to UTF16LE, which I think is implicitly with BOM. Also worth clarify that the chat_ files cannot be UTF-8 it seems, or really any other encoding? I tried a few different encodings (UTF-8, UTF-16BE, UTF-8-BOM, etc) and none worked in-game.

@rbjaxter
Copy link
Owner Author

rbjaxter commented Oct 6, 2023

I hope it's not as simple as the filepath not being read properly, I honestly have no idea how I'd check that. I think this used to work in the past, so I should try this:
resource/*.txt text working-tree-encoding=UTF-16LE-BOM

@rbjaxter
Copy link
Owner Author

rbjaxter commented Oct 6, 2023

When this worked, I had the encoding as ^ that but the chat files themselves were UTF-8. da heck? so should utf-8 encoding be working in-game or not? the only variable is that I was using CRLF with UTF-8, could changing it to LF fix it?

@rbjaxter
Copy link
Owner Author

rbjaxter commented Oct 7, 2023

Honestly seeming like what I intend isn't possible, utf16lebom files already are kinda weird on github as it is, and having diffs for the chat files doesn't really matter that much since they don't change often

@rbjaxter rbjaxter closed this as completed Oct 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Cannot Fix Feature / Improvement Need Help Used for issues that I'm struggling to resolve. Help's appreciated if you have potential solutions!
Projects
None yet
Development

No branches or pull requests

1 participant