Re: [PATCH] git-rebase--interactive: Handle commit messages that end in backslash

From: Thomas Rast <trast@student.ethz.ch>
Date: May 14, 2010, 10:15 UTC
Message-ID: <201005141215.55746.trast@student.ethz.ch>
In-Reply-To: <20100513143350.GA2742@sigill.intra.peff.net>

Jeff King wrote:

Show 10 quoted lines

> 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.

During the actual rebasing, only the 'cmd sha' portion of the line matters, as evidenced by the code doing

  do_next () {
          rm -f "$MSG" "$AUTHOR_SCRIPT" "$AMEND" || exit
          read command sha1 rest < "$TODO"

and then not using $rest except in status messages.

The automatic handling you are referring to is --autosquash, which happens in rearrange_squash() which is a preprocessing stage. AFAICS that function is still okay iff the munging maps prefixes to prefixes.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch