From: Johannes Sixt <j6t@kdbg•org>
To: Junio C Hamano <gitster@pobox•com>
Cc: "tobias.boesch@miele•com" <tobias.boesch@miele•com>,
Git Mailing List <git@vger•kernel.org>
Subject: Re: [PATCH] gitk: fix history window panes position
Date: Fri, 5 Dec 2025 07:40:01 +0100 [thread overview]
Message-ID: <db513191-5f3d-489e-b91a-a788f70b9e8c@kdbg.org> (raw)
In-Reply-To: <xmqq5xal8y5s.fsf@gitster.g>
Am 05.12.25 um 03:23 schrieb Junio C Hamano:
> "git am" (actually "git mailsplit" that is called from it to extract
> what can be used by "git apply") should be able to deal with
>
> Content-Type: text/plain; charset="utf-8"
> Content-Transfer-Encoding: base64
>
> so there may be something else going on.
Ah! You are absolutely right! Clearly, I wasn't fully taking in what
git-am was telling me. The problem isn't the encoding. It's the patch
text itself, in particular, the single SP needed for empty context lines
is missing.
I get this error when I apply the mbox containing the complete email:
$ git am -3 --signoff ~/Mail/ambox
warning: quoted CRLF detected
Applying: gitk: fix history window panes position
error: corrupt patch at line 40
error: could not build fake ancestor
Patch failed at 0001 gitk: fix history window panes position
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: [...]
But it is OK to copy the email body text to a file (which looks like
mbox text) and apply that, despite the missing SP:
$ git am -3 --signoff bla.patch
Applying: gitk: fix history window panes position
Using index info to reconstruct a base tree...
A gitk-git/gitk
Falling back to patching base and 3-way merge...
Why is that?
-- Hannes
next prev parent reply other threads:[~2025-12-05 6:40 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-12-02 13:08 [PATCH] gitk: fix history window panes position tobias.boesch
2025-12-03 9:35 ` AW: " tobias.boesch
2025-12-03 10:15 ` Johannes Sixt
2025-12-04 8:39 ` AW: " tobias.boesch
2025-12-04 9:20 ` Johannes Sixt
2025-12-05 2:23 ` Junio C Hamano
2025-12-05 6:40 ` Johannes Sixt [this message]
2025-12-05 7:22 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=db513191-5f3d-489e-b91a-a788f70b9e8c@kdbg.org \
--to=j6t@kdbg$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=tobias.boesch@miele$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox