From: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun, 17 Jul 2011 18:32:19 GMT
Subject: Re: [PATCH 17/17] revert: Introduce --continue to continue the operation
Message-ID: <20110717183219.GB27787@elie>
In-Reply-To: <CALkWK0==A1a-kzqXuEkjS+FMR1CAzJox8MBdkQGMLukoU15L9w@mail.gmail.com>

Ramkumar Ramachandra wrote:
> Jonathan Nieder writes:

>> The -s thing doesn't have much to do with this change.  But is it a
>> bug or not?  If it's not a bug, then this is not so much a glitch to
>> note as an important feature to ensure people don't sign off on a
>> conflict resolution without thinking about it.  (I guess I think it's
>> a bug.  It's hard to decide.)
>
> Bug, definitely.  It happens because unlike "-x" where the
> cherry-picking machinery appends to the commit message, "-s" is
> handled at commit-time (when it spawns `git commit`).  Ofcourse, if I
> were never to write the sequencing features, this would never been
> seen as a bug -- hence the term "glitch"; an implementation detail
> that doesn't suit our future plans (namely, this series) very well.

Hmm, I thought I remembered this coming up previously and Junio
mentioning that it was intentional (maybe in the context of
CHERRY_HEAD?), but I haven't been able to find the relevant message.