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

git: warning: the following paths have collided ('packages/app-cli/tests/support/photo-åäö.jpg') #11476

Open
samj opened this issue Dec 7, 2024 · 1 comment
Labels
bug It's a bug

Comments

@samj
Copy link

samj commented Dec 7, 2024

Operating system

macOS

Joplin version

N/A

Desktop version info

No response

Current behaviour

% git clone [email protected]:laurent22/joplin.git
Cloning into 'joplin'...
remote: Enumerating objects: 165342, done.
remote: Counting objects: 100% (93/93), done.
remote: Compressing objects: 100% (43/43), done.
remote: Total 165342 (delta 55), reused 81 (delta 49), pack-reused 165249 (from 1)
Receiving objects: 100% (165342/165342), 484.99 MiB | 16.06 MiB/s, done.
Resolving deltas: 100% (124803/124803), done.
warning: the following paths have collided (e.g. case-sensitive paths
on a case-insensitive filesystem) and only one from the same
colliding group is in the working tree:

'packages/app-cli/tests/support/photo-åäö.jpg'
'packages/app-cli/tests/support/photo-åäö.jpg'

Expected behaviour

No git warnings or lost files.

Logs

No response

@samj samj added the bug It's a bug label Dec 7, 2024
@Santhoshmani1
Copy link

The issue arises because the packages/app-cli/tests/support/ directory contains two image files with colliding file paths, but GitHub treats them as unique files due to how it handles Unicode normalization.

The two files, while visually identical, differ at the Unicode level uses precomposed characters (NFC) & combining diacritical marks (NFD).

This arises on Mac because Mac uses NFD for file encoding for both files resulting in same file name when cloned to the local system as photo-åäö.jpg.

The NFD behaviour of MacOs is documented well in this medium post.
https://medium.com/@sthadewald/the-utf-8-hell-of-mac-osx-feef5ea42407

  • We can use a different file name for the files by labelling as photo1.jpg, photo2.jpg or limit to one file.

tnshgarg added a commit to tnshgarg/joplin that referenced this issue Dec 9, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug It's a bug
Projects
None yet
Development

No branches or pull requests

2 participants