From: "René Scharfe" <l.s.r@web.de>
To: "Michael S. Tsirkin" <mst@redhat.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: Re: bug? illegal text in commit log
Date: Tue, 4 Feb 2020 22:10:30 +0100 [thread overview]
Message-ID: <b005193f-24b7-7b6f-f3dc-c7a98db14ed7@web.de> (raw)
In-Reply-To: <20200204010524-mutt-send-email-mst@kernel.org>
Am 04.02.20 um 07:14 schrieb Michael S. Tsirkin:
> It seems that it's not too hard to make commits such that
> the standard way of git format-patch -> email -> git am
> fails.
> A work around is "don't do it" - avoid putting anything that looks like
> a unified diff in the commit log.
>
> However:
> - Users don't know what other restrictions exist
> - User sending the patch has no way to detect failure,
> it's only visible to user receiving the patch
Putting a diff in a commit message can be useful, and forbidding it is
hard to justify.
> Ideas:
> - validate commit log and warn users?
That's only better than the status quo insofar it turns the issue from
a hidden pitfall into an open one.
> - find a way to escape text in git format-patch, and unescape in git am?
Like a Lines: header specifying the number of lines in the commit message?
René
next prev parent reply other threads:[~2020-02-04 21:10 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-04 6:14 bug? illegal text in commit log Michael S. Tsirkin
2020-02-04 21:10 ` René Scharfe [this message]
2020-02-04 21:25 ` Junio C Hamano
2020-02-06 6:34 ` Michael S. Tsirkin
2020-02-06 16:17 ` Junio C Hamano
2020-02-06 16:45 ` Junio C Hamano
2020-02-06 17:30 ` René Scharfe
2020-02-07 5:40 ` Junio C Hamano
2020-02-07 20:30 ` René Scharfe
2020-02-12 2:24 ` Jeff King
2020-02-06 23:56 ` Michael S. Tsirkin
2020-02-07 11:02 ` Pratyush Yadav
2020-02-07 20:31 ` René Scharfe
2020-02-07 21:12 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b005193f-24b7-7b6f-f3dc-c7a98db14ed7@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mst@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).