* git-format-patch does not encode lines starting with "From"
@ 2021-06-27 18:08 Jan Engelhardt
2021-06-28 8:08 ` Ævar Arnfjörð Bjarmason
0 siblings, 1 reply; 2+ messages in thread
From: Jan Engelhardt @ 2021-06-27 18:08 UTC (permalink / raw)
To: git
Summary
=======
git-format-patch in 2.32.0 fails to quote/escape lines starting with
"From ", and mbox readers conclude there is an empty mail.
Observed
========
$ git commit -m 'subject
From ffffffffffffffffffffffffffffffffffffffff Mon Sep 17 00:00:00 2001
with love.'
$ git format-patch HEAD^!
$ head 0001-subject.patch
From d489071b4855a49b32e9b5ae5addd982d2ed8d7d Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 27 Jun 2021 20:04:20 +0200
Subject: [PATCH] subject
From ffffffffffffffffffffffffffffffffffffffff Mon Sep 17 00:00:00 2001
with love.
$ git reset --hard HEAD^
$ git am -p0 0001-subject.patch
Patch is empty.
When you have resolved this problem, run "git am --continue".
Expected to see
===============
$ head 0001-subject.patch
From d489071b4855a49b32e9b5ae5addd982d2ed8d7d Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Sun, 27 Jun 2021 20:04:20 +0200
Subject: [PATCH] subject
>From ffffffffffffffffffffffffffffffffffffffff Mon Sep 17 00:00:00 2001
with love.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: git-format-patch does not encode lines starting with "From"
2021-06-27 18:08 git-format-patch does not encode lines starting with "From" Jan Engelhardt
@ 2021-06-28 8:08 ` Ævar Arnfjörð Bjarmason
0 siblings, 0 replies; 2+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2021-06-28 8:08 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: git
On Sun, Jun 27 2021, Jan Engelhardt wrote:
> Summary
> =======
>
> git-format-patch in 2.32.0 fails to quote/escape lines starting with
> "From ", and mbox readers conclude there is an empty mail.
>
>
> Observed
> ========
>
> $ git commit -m 'subject
>
> From ffffffffffffffffffffffffffffffffffffffff Mon Sep 17 00:00:00 2001
> with love.'
> $ git format-patch HEAD^!
> $ head 0001-subject.patch
> From d489071b4855a49b32e9b5ae5addd982d2ed8d7d Mon Sep 17 00:00:00 2001
> From: Jan Engelhardt <jengelh@inai.de>
> Date: Sun, 27 Jun 2021 20:04:20 +0200
> Subject: [PATCH] subject
>
> From ffffffffffffffffffffffffffffffffffffffff Mon Sep 17 00:00:00 2001
> with love.
>
> $ git reset --hard HEAD^
> $ git am -p0 0001-subject.patch
> Patch is empty.
> When you have resolved this problem, run "git am --continue".
>
>
> Expected to see
> ===============
>
> $ head 0001-subject.patch
> From d489071b4855a49b32e9b5ae5addd982d2ed8d7d Mon Sep 17 00:00:00 2001
> From: Jan Engelhardt <jengelh@inai.de>
> Date: Sun, 27 Jun 2021 20:04:20 +0200
> Subject: [PATCH] subject
>
>>From ffffffffffffffffffffffffffffffffffffffff Mon Sep 17 00:00:00 2001
> with love.
"git format-patch --pretty=mboxrd" and "git am --patch-format" should
solve this issue for you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-28 8:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-27 18:08 git-format-patch does not encode lines starting with "From" Jan Engelhardt
2021-06-28 8:08 ` Ævar Arnfjörð Bjarmason
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).