Re: [PATCHv3] git-rebase--interactive.sh: extend "edit" command to be more useful

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Dec 3, 2010, 10:00 UTC
Message-ID: <20101203100059.GA12043@burratino>
In-Reply-To: <4CF8BE8E.4090100@viscovery.net>

Johannes Sixt wrote:

> Am 12/3/2010 9:06, schrieb Jonathan Nieder:

>> Maybe this can be done without relying on details of --pretty=oneline
>> format?
>
> No. This is a matter of the syntax of the recipe file.

My suggestion was nonsense for other reasons, too.

Show 5 quoted lines

>> 
>> 			sha1=$(git rev-parse --short HEAD)
>> 			rest=$(git show -s --format=%s HEAD)
>
> Shouldn't $sha1 be the one given in the recipe rather than current HEAD?

This code branch is about mentally rewriting

	pick 87a78c
	fixup 987ca
	edit - time to test

to

	pick 87a78c
	fixup 987ca
	edit <whatever is HEAD at that moment>

and printing "time to test" as a reminder to the user.

> But most importantly, since $rest is echoed on the terminal, it MUST be
> derived from the recipe ($line). Rationale: I replace the commit subject
> in the recipe by a reminder what I intend to do when the "edit" command
> stops---I don't care so much what the commit subject is.

Kevin, this sounds like a vote for the "replace commit message" output format.

Thanks, that was useful. Jonathan