Skip to content

Instantly share code, notes, and snippets.

@tfnico
Created June 12, 2012 10:47
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save tfnico/2916855 to your computer and use it in GitHub Desktop.
Save tfnico/2916855 to your computer and use it in GitHub Desktop.
Testing encoding in filenames on git
First, check in a file on OSX:
➜ ~/projects/agnes/[master]>touch fæøå.txt tfnico@thomas-ferris-nicolaisens-imac [12:34:38]
➜ ~/projects/agnes/[master]✗>ls tfnico@thomas-ferris-nicolaisens-imac [12:34:56]
agnes.iml build.xml funky fæøå.txt macroman.txt pom.xml readme.txt src target
➜ ~/projects/agnes/[master]✗>git st tfnico@thomas-ferris-nicolaisens-imac [12:34:58]
# On branch master
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# "f\303\246\303\270a\314\212.txt"
nothing added to commit but untracked files present (use "git add" to track)
➜ ~/projects/agnes/[master]✗>git add fæøa<030a>.txt tfnico@thomas-ferris-nicolaisens-imac [12:34:58]
➜ ~/projects/agnes/[master]✗>git st tfnico@thomas-ferris-nicolaisens-imac [12:35:03]
# On branch master
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# new file: "f\303\246\303\270a\314\212.txt"
#
➜ ~/projects/agnes/[master]✗>git commit -m "Add file with norwegian chars in filename" tfnico@thomas-ferris-nicolaisens-imac [12:35:04]
[master ca6ce76] Add file with norwegian chars in filename
0 files changed
create mode 100644 "f\303\246\303\270a\314\212.txt"
➜ ~/projects/agnes/[master]>git push tfnico@thomas-ferris-nicolaisens-imac [12:35:22]
Counting objects: 4, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 306 bytes, done.
Total 3 (delta 1), reused 0 (delta 0)
remote: Sending mail...
remote: % Total % Received % Xferd Average Speed Time Time Time Current
remote: Dload Upload Total Spent Left Speed
remote: 100 36 100 36 0 0 451 0 --:--:-- --:--:-- --:--:-- 529
remote: Scheduled polling of Sandbox-agnes
To git@viaboxxsystems.de:sandbox/agnes.git
5a7b1c4..ca6ce76 master -> master
➜ ~/projects/agnes/[master]>
Now, check it out on windows:
C:\projects\agnes>git pull
Enter passphrase for key '/c/Dokumente und Einstellungen/roman/.ssh/id_rsa':
remote: Counting objects: 100, done.
remote: Compressing objects: 100% (93/93), done.
remote: Total 94 (delta 57), reused 0 (delta 0)
Unpacking objects: 100% (94/94), done.
From viaboxxsystems.de:sandbox/agnes
8a0c03f..ca6ce76 master -> origin/master
2a048d7..8ba9a8e stable -> origin/stable
From viaboxxsystems.de:sandbox/agnes
* [new tag] 1.2.3 -> 1.2.3
Updating 43a744c..ca6ce76
Fast-forward
build.xml | 8 ++++++++
funky/readme.txt | 2 ++
readme.txt | 23 +++++++++++++++++++++++
3 files changed, 33 insertions(+), 0 deletions(-)
create mode 100644 build.xml
create mode 100644 "f\303\246\303\270a\314\212.txt"
C:\projects\agnes>dir
Volume in Laufwerk C: hat keine Bezeichnung.
Volumeseriennummer: F01D-CA82
Verzeichnis von C:\projects\agnes
12.06.2012 12:36 <DIR> .
12.06.2012 12:36 <DIR> ..
19.04.2012 11:21 22 .gitignore
12.06.2012 12:36 344 build.xml
19.04.2012 11:21 <DIR> funky
12.06.2012 12:36 0 fæøaÌS.txt
19.04.2012 11:21 48 macroman.txt
19.04.2012 12:22 1.262 pom.xml
19.04.2012 11:39 1.295 pom.xml.releaseBackup
12.06.2012 12:36 3.173 readme.txt
19.04.2012 11:39 862 release.properties
19.04.2012 11:21 <DIR> src
19.04.2012 11:39 <DIR> target
8 Datei(en) 7.006 Bytes
5 Verzeichnis(se), 10.405.605.376 Bytes frei
C:\projects\agnes>git --version
git version 1.7.6.msysgit.0
C:\projects\agnes>
Now, upgrade to mssygit 1.7.10 or newer.
C:\projects\agnes>git --version
git version 1.7.10.msysgit.1
C:\projects\agnes>git pull
Enter passphrase for key '/c/Dokumente und Einstellungen/roman/.ssh/id_rsa':
Already up-to-date.
C:\projects\agnes>git st
# On branch master
# Changes not staged for commit:
# (use "git add/rm <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# deleted: "f\303\246\303\270a\314\212.txt"
# modified: pom.xml
#
# Untracked files:
# (use "git add <file>..." to include in what will be committed)
#
# "f\303\203\302\246\303\203\302\270a\303\214\305\240.txt"
# pom.xml.releaseBackup
# release.properties
no changes added to commit (use "git add" and/or "git commit -a")
C:\projects\agnes>dir
Volume in Laufwerk C: hat keine Bezeichnung.
Volumeseriennummer: F01D-CA82
Verzeichnis von C:\projects\agnes
12.06.2012 12:36 <DIR> .
12.06.2012 12:36 <DIR> ..
19.04.2012 11:21 22 .gitignore
12.06.2012 12:36 344 build.xml
12.06.2012 12:36 <DIR> funky
12.06.2012 12:36 0 fæøaÌS.txt
19.04.2012 11:21 48 macroman.txt
19.04.2012 12:22 1.262 pom.xml
19.04.2012 11:39 1.295 pom.xml.releaseBackup
12.06.2012 12:36 3.173 readme.txt
19.04.2012 11:39 862 release.properties
19.04.2012 11:21 <DIR> src
19.04.2012 11:39 <DIR> target
8 Datei(en) 7.006 Bytes
5 Verzeichnis(se), 10.197.843.968 Bytes frei
C:\projects\agnes>git clean -df
Removing "f\303\203\302\246\303\203\302\270a\303\214\305\240.txt"
Removing pom.xml.releaseBackup
Removing release.properties
C:\projects\agnes>git co .
C:\projects\agnes>git st
# On branch master
nothing to commit (working directory clean)
C:\projects\agnes>ls
build.xml funky f????a??.txt macroman.txt pom.xml readme.txt src target
C:\projects\agnes>dir
Volume in Laufwerk C: hat keine Bezeichnung.
Volumeseriennummer: F01D-CA82
Verzeichnis von C:\projects\agnes
12.06.2012 12:43 <DIR> .
12.06.2012 12:43 <DIR> ..
19.04.2012 11:21 22 .gitignore
12.06.2012 12:36 344 build.xml
12.06.2012 12:36 <DIR> funky
12.06.2012 12:43 0 fæøa°.txt
19.04.2012 11:21 48 macroman.txt
12.06.2012 12:43 1.295 pom.xml
12.06.2012 12:36 3.173 readme.txt
19.04.2012 11:21 <DIR> src
19.04.2012 11:39 <DIR> target
6 Datei(en) 4.882 Bytes
5 Verzeichnis(se), 10.197.843.968 Bytes frei
Note that it looks a bit funky with the a° vs a proper å. I think this is due to OSX representing å a bit differently than Windows..
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment