在 4/25/22 11:19 AM, yanteng si 写道: > baihaowen <baihaowen@xxxxxxxxx> 于2022年4月25日周一 09:17写道： >> 在 4/24/22 11:16 AM, Alex Shi 写道: >>> On 4/24/22 10:56, baihaowen wrote: >>>>>> + ====== ========== ================== >>>> hi, Alex >>>> I can apply local. >>>> ➜ linux-next git:(heads/next-20220421) ✗ git am doc_pageonwer_patches/0001-docs-zh_CN-sync-with-original-text-Documentation-vm-.patch >>>> 应用：docs/zh_CN: sync with original text Documentation/vm/page_owner.rst >>>> ➜ linux-next git:(heads/next-20220421) ✗ git am doc_pageonwer_patches/0002-doc-vm-page_owner.rst-Fix-table-display-confusion.patch >>>> 应用：doc/vm/page_owner.rst: Fix table display confusion >>>> >>>> I think git send-email will change format by my select. I'll try to resend. >>> Send to yourself only then get it from your email client and try applying. >>> >>> Thanks >>> Alex >> Hi Alex >> >> Could you tell me how do you do when you get a patch from email ? > $: git clone git://git.kernel.org/pub/scm/utils/b4/b4.git > $: b4/b4.sh am <message-id> > ###在你的邮箱里查看原始有邮件，然后找到message-id，贴过来就行，前提是你的补丁系列在lore里是按照前几天我说的那么弄。 > $: vim xxxx.mbx ### [modify your patch] > $: git am xxxx.mbx > > > Thanks, > Yanteng > >> I get my patch from email and then copy-patse to a new file, then git am xx.patch. >> It will notice 补丁格式检测失败。 >> >> -- >> Haowen Bai >> hi, Yanteng No matter I select y or N, I could not git am the Chinese translation patch. doc_pageonwer_patches/0001-docs-zh_CN-sync-with-original-text-Documentation-vm-.patch Which 8bit encoding should I declare [UTF-8]? y Are you sure you want to use <y> [y/N]? y doc_pageonwer_patches/0001-docs-zh_CN-sync-with-original-text-Documentation-vm-.patch Which 8bit encoding should I declare [UTF-8]? N Are you sure you want to use <N> [y/N]? y $git am xxx.patch error: cannot convert from y to UTF-8 fatal: could not parse patch or $git am xxx.patch error: cannot convert from N to UTF-8 fatal: could not parse patch so, the problem is happening when I did git send-email, and the original zh_CN patch is successful for git am. Have you ever meet this problem ? -- Haowen Bai
