git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Chris Lamb <lamby@debian.org>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] git-rebase--interactive: Handle commit messages that end in backslash
Date: Thu, 13 May 2010 10:33:50 -0400	[thread overview]
Message-ID: <20100513143350.GA2742@sigill.intra.peff.net> (raw)
In-Reply-To: <20100513135807.548594f9@bobcat.office>

On Thu, May 13, 2010 at 01:58:07PM +0100, Chris Lamb wrote:

> Disregard the patch; it has some funky side-effect which breaks ONTO
> parsing and I don't know why.
>
> (The problem still exists though.)

Hmm. It looks like there is more weirdness, too. Try

  git commit -m 'magic \\n newline'

I get a stray newline in the git-rebase-todo file. IIRC, we had this
problem before because some shells' "echo" will interpret, and some will
not (I think bash will not, but dash will). So there are a few "echo"
calls that need to be "printf %s" in git-rebase--interactive.

But I wonder if we would do better to simply sanitize the subject line
of metacharacters. As I understand it[1], the subject line shown is for
human consumption only, and the actual operations happen on the included
sha1. So we could munge it in a non-reversible way without breaking
anything.

-Peff

[1] I may be wrong. This is not code I'm too familiar with, and I do
remember a proposal at some point for automagically handling subjects
with "wip" or "squash" in them. Still, a light munging may work.

  reply	other threads:[~2010-05-13 14:33 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-13 12:39 [PATCH] git-rebase--interactive: Handle commit messages that end in backslash Chris Lamb
2010-05-13 12:58 ` Chris Lamb
2010-05-13 14:33   ` Jeff King [this message]
2010-05-14 10:15     ` Thomas Rast

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=20100513143350.GA2742@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    --cc=lamby@debian.org \
    /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.
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 NNTP newsgroup(s).