Cannot patch a diff that edits files with non-ascii filenames
Open, HighPublic
Actions

Assigned To

None

Authored By

	kuba-orlik
	Apr 30 2024, 12:56

Description

Steps to reproduce:

Create a repository in Phorge, and get its URL. In my case it's https://hub.sealcode.org/diffusion/ASCIIREPRO/non-ascii-filenames-repro.git

git clone https://hub.sealcode.org/diffusion/ASCIIREPRO/non-ascii-filenames-repro.git
cd non-ascii-filenames-repro.git
echo "2" >> "zażółć gęsią jaźń.txt"
git add .
git commit -a -m "Update"
arc diff

Then, get the Revision number, and run

git clone https://hub.sealcode.org/diffusion/ASCIIREPRO/non-ascii-filenames-repro.git
arc patch D123

The error says:

Created and checked out branch arcpatch-D1450.
Checking patch "\"a/za\\305\\274\\303\\263\\305\\202\\304\\207 g\\304\\231si\\304\\205 ja\\305\\272\\305\\204.txt\"" => "za\305\274\303\263\305\202\304\207 g\304\231si\304\205 ja\305\272\305\204.txt"...
error: "a/za\305\274\303\263\305\202\304\207 g\304\231si\304\205 ja\305\272\305\204.txt": does not exist in index

Related Objects

Mentioned Here: P41 0001-test-commit.patch
D25623: Testing if a bug can be replicated @ upstream
P38 (An Untitled Masterwork)

Event Timeline

kuba-orlik created this task.Apr 30 2024, 12:56

Herald added subscribers: Cigaryno, Matthew, chris, tobiaswiese. · View Herald TranscriptApr 30 2024, 12:56

valerio.bozzolan triaged this task as High priority.Apr 30 2024, 13:07

valerio.bozzolan added a project: Arcanist.

valerio.bozzolan subscribed.

I also faced this, tested @ D25623, and found out git format-patch was emitting that result which causes git apply to fail. See this git format-patch example.

P38 (An Untitled Masterwork)

1	From ebdcaa8778a02b492eff2587c6120f2f5082df63 Mon Sep 17 00:00:00 2001
2	From: Yongmin Hong <revi@omglol.email>
3	Date: Sat, 11 May 2024 09:51:30 +0000
4	Subject: [PATCH] Add
5
6	Signed-off-by: Yongmin Hong <revi@omglol.email>
7	---
8	"\355\205\214\354\212\244\355\212\270.md" \| 1 +
9	1 file changed, 1 insertion(+)
10	create mode 100644 "\355\205\214\354\212\244\355\212\270.md"
11
12	diff --git "a/\355\205\214\354\212\244\355\212\270.md" "b/\355\205\214\354\212\244\355\212\270.md"
13	new file mode 100644
14	index 0000000..6de7b8c
15	--- /dev/null
16	+++ "b/\355\205\214\354\212\244\355\212\270.md"
17	@@ -0,0 +1 @@
18	+This is a test file.
19	--
20	2.32.7

Filename should have been 테스트.md.

Posted question at git@vger.kernel.org.

workaround:

git config --global core.quotepath false

After the patch:

P41 0001-test-commit.patch

1	From d2aa2b2f5aa290edec6a5fd141318a479ac9de8e Mon Sep 17 00:00:00 2001
2	From: Yongmin Hong <revi@omglol.email>
3	Date: Tue, 14 May 2024 15:15:52 +0000
4	Subject: [PATCH] test commit
5
6	---
7	테스트.txt \| 1 +
8	1 file changed, 1 insertion(+)
9	create mode 100644 테스트.txt
10
11	diff --git a/테스트.txt b/테스트.txt
12	new file mode 100644
13	index 0000000..86724be
14	--- /dev/null
15	+++ b/테스트.txt
16	@@ -0,0 +1 @@
17	+BlahBlah
18	--
19	2.32.7

And applies on arc cleanly:

revi attached a referenced file: F2191753: image.png. (Show Details)May 14 2024, 22:01

Cannot patch a diff that edits files with non-ascii filenamesOpen, HighPublicActions

Description

Related Objects

Event Timeline

Cannot patch a diff that edits files with non-ascii filenames
Open, HighPublic
Actions