Re: [PATCH 3/3] git-rebase--interactive.sh: Make 3-way merge strategies work for -p.

From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Oct 31, 2007, 02:53 UTC
Message-ID: <20071031025320.GA1375@atjola.homenet>
In-Reply-To: <Pine.LNX.4.64.0710310239100.4362@racer.site>

Hi Dscho,

On 2007.10.31 02:42:03 +0000, Johannes Schindelin wrote:

Show 11 quoted lines

> Hi Björn,
> 
> On Wed, 31 Oct 2007, Björn Steinbrink wrote:
> 
> > +			new_parents=${new_parents# $first_parent}
> 
> I wanted to comment that this might not be present in shells other than 
> bash, but I see that we rely on that construct already in am, clone, 
> commit, filter-branch, merge, pull, rebase, stash and submodule.
>
> So I think it's okay.

Actually, I checked first that it's not bash-only (I saw the flames about that on lkml some time ago, so I've been scared ;-)). Works fine with dash here and it's in the posix sh specs. See 2.6.2 in http://www.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html

So I hope that there's a bit of a broader support for it :-)

> The whole series is _very_ nicely done, and appears to me as obviously 
> correct.

Thanks :-)

Björn