Files with non-ASCII names break git rebase-update on Mac/HFS |
||||||
Issue descriptionAfter https://crrev.com/c/802554, there are some test files with non-ASCII names. This is breaking my git on my Mac, and probably affects most Mac users. > git --version git version 2.12.2 /V/s/c/src (isolation)> git st Untracked files: (use "git add <file>..." to include in what will be committed) "third_party/WebKit/LayoutTests/http/tests/local/fileapi/resources/file-for-drag-to-send3-a\314\202\313\234\302\272\303\260Y\314\210\313\234\342\200\232.txt" This is the file with the name "file-for-drag-to-send3-☺😂.txt". You can tell because of the "a" and the "Y" that this is stored decomposed, as is HFS's style. If you remove that file (because having an untracked file is a problem), you get: > rm /Volumes/src/chrome-git/src/third_party/WebKit/LayoutTests/http/tests/local/fileapi/resources/file-for-drag-to-send3-☺😂.txt > git st Changes not staged for commit: deleted: "third_party/WebKit/LayoutTests/http/tests/local/fileapi/resources/file-for-drag-to-send3-\303\242\313\234\302\272\303\260\305\270\313\234\342\200\232.txt" --- There is a git flag: > git config --global core.precomposeunicode true which is supposed to fix this. And it fixes the case I mention above. But git rebase-update is still broken: Rebasing: debuglogging Failed! Attempting to squash debuglogging ... Failed! Second rebase succeeded unexpectedly! Please see: http://crbug.com/425696 First rebased failed with: error: The following untracked working tree files would be overwritten by merge: third_party/WebKit/LayoutTests/http/tests/local/fileapi/resources/file-for-drag-to-send3-☺😂.txt Please move or remove them before you merge. Aborting error: Failed to merge in the changes. This isn't good.
,
Dec 8 2017
Does this fix it? git config --global core.precomposeunicode true If so, we should add it to setup instructions.
,
Dec 8 2017
Documented here: https://git-scm.com/docs/git-config#git-config-coreprecomposeUnicode
,
Dec 8 2017
git config --global core.precomposeunicode true fixes the git st, but *not* the rebase-update.
,
Dec 8 2017
"git config core.precomposeunicode true" fixed the problem for me, but I had to make it local, not global. git rebase-update seems fixed after this from a trivial local test. Issue 792302 for non-OSX specific problems.
,
Dec 8 2017
Even when I set that locally, I still get rebase-update failures: /V/s/c/src (isolation)> git config --local core.precomposeunicode true /V/s/c/src (isolation)> git reup Fetching origin remote: Counting objects: 278942, done remote: Finding sources: 100% (173/173) remote: Total 173 (delta 14), reused 132 (delta 14) Receiving objects: 100% (173/173), 1.75 MiB | 0 bytes/s, done. Resolving deltas: 100% (14/14), completed with 13 local objects. From https://chromium.googlesource.com/chromium/src 33177d59859f..9b718ad43554 master -> origin/master e3285126bdc5..7b5835794a80 refs/branch-heads/3282 -> branch-heads/3282 Rebasing: autofocus Rebasing: autofocus2 Rebasing: beforeunloadcrash Rebasing: browsershortcutexperiment Rebasing: callback Rebasing: clang-blink Rebasing: closewidget Rebasing: dcheck Rebasing: debuglogging Failed! Attempting to squash debuglogging ... Failed! Second rebase succeeded unexpectedly! Please see: http://crbug.com/425696 First rebased failed with: error: The following untracked working tree files would be overwritten by merge: third_party/WebKit/LayoutTests/http/tests/local/fileapi/resources/file-for-drag-to-send3-☺😂.txt Please move or remove them before you merge. Aborting error: Failed to merge in the changes.
,
Dec 8 2017
Sent PSA in the meantime to alert users, as OSX users seem disproportionally affected by this.
,
Dec 8 2017
,
Dec 8 2017
Localized revert sent for review https://chromium-review.googlesource.com/c/chromium/src/+/817698
,
Dec 8 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/763f394a34933306409c1d15bfddc412e979f461 commit 763f394a34933306409c1d15bfddc412e979f461 Author: Benjamin C. Wiley Sittler <bsittler@chromium.org> Date: Fri Dec 08 20:51:19 2017 Forms: remove accidental normalization-varying filename characters These cause problems on macOS until git config is updated. TBR= Bug: 793347 , 792302 Change-Id: I54e53fdcd97ab42464ee84a1f216db4d393609bd Reviewed-on: https://chromium-review.googlesource.com/817698 Commit-Queue: Marc-Antoine Ruel <maruel@chromium.org> Reviewed-by: Dirk Pranke <dpranke@chromium.org> Reviewed-by: Marc-Antoine Ruel <maruel@chromium.org> Cr-Commit-Position: refs/heads/master@{#522867} [delete] https://crrev.com/06d36e78907996e8778c06caa177f663920c2396/third_party/WebKit/LayoutTests/http/tests/local/fileapi/resources/file-for-drag-to-send3-☺😂.txt [modify] https://crrev.com/763f394a34933306409c1d15bfddc412e979f461/third_party/WebKit/LayoutTests/http/tests/local/fileapi/select-dragged-file-input-utf-8.html
,
Dec 8 2017
,
Jan 3 2018
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/94b7e2a3b5be144fc1172a9bda57acd76eefbb9e commit 94b7e2a3b5be144fc1172a9bda57acd76eefbb9e Author: Aaron Gable <agable@chromium.org> Date: Wed Jan 03 20:31:19 2018 Update mac starter instructions for unicode filenames R=tandrii Bug: 793347 Change-Id: I348a5e568066b7304cdacd71c79ed203de3fd217 Reviewed-on: https://chromium-review.googlesource.com/849272 Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org> Commit-Queue: Aaron Gable <agable@chromium.org> Cr-Commit-Position: refs/heads/master@{#526791} [modify] https://crrev.com/94b7e2a3b5be144fc1172a9bda57acd76eefbb9e/docs/mac_build_instructions.md
,
Jan 3 2018
|
||||||
►
Sign in to add a comment |
||||||
Comment 1 by mar...@chromium.org
, Dec 8 2017Owner: aga...@chromium.org