Re: Some ideas for StGIT

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

Hi,

On Sun, 5 Aug 2007, Josef Sipek wrote:

> On Sun, Aug 05, 2007 at 02:56:23PM +0100, Johannes Schindelin wrote:
> > 
> > On Sun, 5 Aug 2007, Josef Sipek wrote:
> > 
> > > Sure, if you can take 2 commits and collapse them into one you could 
> > > fake it by creating a dummy commit with the new changes, and then 
> > > collapsing, but that's nasty - and reflog might not like that much 
> > > :)
> > 
> > IIUC you want to edit/amend a patch in the middle of a series?  Two ways 
> > to go about it:
> > 
> > 	1) (preferred)
> > 
> > 		* start rebase -i
> > 		* mark the commit as "edit"
> > 		* wait until rebase stops to let you edit it
> > 		* edit, test, commit --amend
> > 		* rebase --continue
> 
> Ewww...that doesn't seem to scale (read: far too much to type) :) Here's a
> quilt/guilt/stgit equivalent:
> 
> 	$APP push <patchname>
> 
> or (depending on where you are in the patch stack)
> 
> 	$APP pop <patchname>
> 
> 	<edit>
> 
> 	$APP refresh # this is the commit --amend part

Yeah.  Sounds like you'd just need a "--edit-this $commit" flag to rebase 
-i.

Out of curiousity, what happens if you say "push" several times, 
_without_ popping the patch?  And what happens if you "push" several times 
with the _same_ patchname?

Ciao,
Dscho