Re: [PATCH] Allow cherry-picking root commits
- From
Stephan Beyer <s-beyer@gmx.net>
- Date
- Jul 4, 2008, 16:41 UTC
- Message-ID
- <20080704164141.GA28515@leksak.fem-net>
- In-Reply-To
- <alpine.DEB.1.00.0807041617320.9925@racer>
On Fri, Jul 04, 2008 at 04:19:52PM +0100, Johannes Schindelin wrote:
> Anyhow, I give up on trying to convince you.
Great :) Big thanks for the patch!
It also works with my rebase-i variant with just an unimportant "fatal" which can be shut up by
--- a/git-sequencer.sh +++ b/git-sequencer.sh @@ -211,7 +211,7 @@ pick_one () { ;; cherry-pick,*) # fast forward - if test "$(git rev-parse --verify "$1^")" = \ + if test "$(git rev-parse --verify "$1^" 2>/dev/null)" = \ "$(git rev-parse --verify HEAD)" then perform git reset --hard "$1" ### Regards.
-- Stephan Beyer <s-beyer@gmx.net>, PGP 0x6EDDD207FCC5040F