Re: [PATCH 0/10] re-based and expanded tree-walker cleanup patches

From: Junio C Hamano <junkio@cox.net>
Date: May 30, 2006, 03:04 UTC
Message-ID: <7vmzd05i25.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0605291739430.5623@g5.osdl.org>

Linus Torvalds <torvalds@osdl.org> writes:

Show 10 quoted lines

> On Mon, 29 May 2006, Junio C Hamano wrote:
>> 
>> Sorry for having you have done this -- last night I've merged
>> the series without rebasing and have the result in "next".  I'll
>> compare to see if you have spotted my mismerges there tonight.
>
> It was interesting. I cleaned up the series and switched the order of some 
> commits in my tree by doing first a "git rebase" and then cherry-picking 
> them into another branch, and using "git commit --amend" to fix up some of 
> the things I had missed.

I just did this (readers on the list needs to disect "next" if they are interested to reproduce this, since I do not publish individual topic heads, but each of the merge commits on "next" tells which topics are merged, so that should be trivial):

	$ git checkout -b lt/tree-2 master
        $ apply your 10-patch series
	$ git show-branch lt/tree lt/tree-2 jc/lt-tree-n-cache-tree next

Your yesterday's series is on lt/tree, and jc/lt-tree-n-cache-tree is my "evil merge" branch to adjust it to the cache-tree that I had in "next". It's tip has cache-tree and lt/tree merged, so it should match the early parts of today's 10-patch series. I used show-branch to find that lt/tree-2~5 is the one to match yesterday's series:

	$ git diff --name-only lt/tree~4..lt/tree |
	  xargs git diff lt/tree-2~5 jc/lt-tree-n-cache-tree --

This shows only cosmetic differences, which is good.

> Pretty powerful, although at one point I was wondering about having a "git 
> rebase" that could switch commits around or drop unwanted ones (ie let the 
> user edit the cherry-picking list before the actual rebase).

I think true power users would just do the last two lines of git-rebase.sh by hand in two steps. By stashing away the format-patch output, and using git-am interactively, you can easily drop unwanted ones, and then re-run git-am on the same format-patch output to apply the ones you dropped on the first run practically amounts to reordering the patches ;-).