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

From: Jani Nikula <jani.nikula@intel.com>
To: Josh Triplett <josh@joshtriplett.org>,
	David Howells <dhowells@redhat.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>,
	Christoph Lameter <cl@linux.com>,
	"ksummit-discuss@lists.linuxfoundation.org"
	<ksummit-discuss@lists.linuxfoundation.org>
Subject: Re: [Ksummit-discuss] [ANNOUNCE] git-series: track changes to a patch series over time
Date: Thu, 04 Aug 2016 15:44:00 +0300	[thread overview]
Message-ID: <87twf0oga7.fsf@intel.com> (raw)
In-Reply-To: <20160730050241.xyxkhztigh7j5jbe@x>

On Sat, 30 Jul 2016, Josh Triplett <josh@joshtriplett.org> wrote:
> On Fri, Jul 29, 2016 at 09:13:58PM +0100, David Howells wrote:
>> James Bottomley <James.Bottomley@HansenPartnership.com> wrote:
>> 
>> > 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.
>> 
>> One of the reasons I use stgit is when it comes to excising changes into a
>> separate patch, it makes it a lot easier:
>> 
>> 	 stg show >tmp.diff	# Export contents of current patch
>> 	 emacs tmp.diff		# Edit so it only has the hunks I want to remove
>> 	 stg pop		# Pop the patch I want to remove part of
>> 	 stg new foo		# Create a new patch
>> 	 stg fold tmp.diff	# ... and apply the patch created above
>> 	 emacs ...		# Fix up any bits
>> 	 stg refresh		# ... and make a commit out of it
>> 	 stg push		# Push the patch I wanted to remove from
>
> Typically, I'd do the same thing by using `git rebase -i` (or `git
> series rebase -i`), marking the patch I want to split as 'e' for edit to
> stop with that patch on top of the stack, resetting it, and using add -p
> and committing bits incrementally into multiple commits.  (I can grab
> bits of the commit message from ORIG_HEAD as needed.)

Same here. Very powerful, and saves you from editing diffs
directly.

It's also sometimes useful to combine this with temporary reverts of
other commits for cleanly moving conflicting hunks earlier in the
series. It may conflict later anyway, but at least the reordering
doesn't have to conflict every step of the way.

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center