[Ksummit-discuss] [ANNOUNCE] git-series: track changes to a patch series over time

[James Bottomley]

On Fri, 2016-07-29 at 17:52 +0000, Bird, Timothy wrote:
> 
> > -----Original Message-----
> > From: ksummit-discuss-bounces at lists.linuxfoundation.org [mailto:ksu
> > mmit-
> > discuss-bounces at lists.linuxfoundation.org] On Behalf Of Christoph
> > Lameter
> > Sent: Friday, July 29, 2016 7:21 AM
> > To: David Howells <dhowells at redhat.com>
> > Cc: ksummit-discuss at lists.linuxfoundation.org
> > Subject: Re: [Ksummit-discuss] [ANNOUNCE] git-series: track changes
> > to a patch
> > series over time
> > 
> > On Fri, 29 Jul 2016, David Howells wrote:
> > 
> > > Josh Triplett <josh at joshtriplett.org> wrote:
> > > 
> > > > Note that git-series doesn't provide a quilt-style push/pop
> > > > workflow,
> > > > with applied and unapplied patches; it just looks at HEAD.
> > > 
> > > Ah...  In that case it's probably not a sufficient substitute for
> > > how I use
> > > stgit.
> > 
> > Did not know that there was stgit. Still stuck on quilt since
> > I like editing the files directly (its often easier to edit the
> > diffs if
> > you want to rename things etc).
> > 
> > Interesting projects.
> 
> Indeed.  For many years I used a quilt-based workflow.  Recently
> I've been trying to convert to a pure git-based workflow, but for
> some reason git rebase -I always seems to give me problems.  It
> always takes me much longer to just move some hunk from one
> commit to another than it did in quilt using the patches and vi.

I do this too, but I also work with the diff when moving hunks.  What I
do is:

git checkout <removal commit>
git show <removal commit> > tmp.diff
vi tmp.diff so it only has the hunks I want to remove
patch -p1 -R < ~/tmp.diff
git commit --amend -a
git checkout <add commit>
patch -p1 < ~/tmp.diff
git commit --amend -a

It's a bit cumbersome, but you can script it.  If there are better ways
to do it, I'm interested.

James