-
-
Notifications
You must be signed in to change notification settings - Fork 185
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
Fix repository name collision #1596
base: master
Are you sure you want to change the base?
Conversation
at the same time, each of them with unique filename which led to naming collision. TL;DR: because of file names encoded differently on macOS and Linux by default, files with umlauts and similar marks, added both on Linux and macOS at the same path may result in naming collision. The proposed fix is to enable Unicode precomposition (basically UTF-8 support) in macOS version of git, and disable `quotePath`: ``` git config --global core.precomposeunicode true git config --global core.quotePath false ``` then re-add files of the concern: ``` git rm --cached ... git add ``` https://stackoverflow.com/questions/34549040/git-not-displaying-unicode-file-names deleted: "man\314\203ana.txt" deleted: "ma\303\261ana.txt"
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1596 +/- ##
=========================================
Coverage ? 97.28%
=========================================
Files ? 48
Lines ? 4607
Branches ? 0
=========================================
Hits ? 4482
Misses ? 125
Partials ? 0
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
Tbh I never liked having that file around. The file is used in a couple of tests: Lines 57 to 75 in 69662e3
Line 180 in 69662e3
Lines 234 to 246 in 69662e3
The tests were skipped on non-linux OS. I think we should refactor those tests and create the src template in a tmp dir during the test using Do you think you could do that? |
The most weird thing is that tests still pass, so I guess they were not doing what I thought 🤔 |
Two versions of
tests/demo/doc/mañana.txt
existed in the repository at the same time, each of them with unique filename.This was possible because of git ill-formed approach utilizing filesystem-dependent filename representations by default.
It's likely that the mentioned file was added twice: both on Linux and macOS, and due to filename encoding differences between the systems, git permitted it.
This PR fixes #1595 by: