From: Yann Dirson <ydirson@altern.org>
Date: Sun, 08 Jan 2006 10:01:59 GMT
Subject: Re: [PATCH 4/7] Add a test for rebase when a change was picked upstream
Message-ID: <20060108100159.GE32585@nowhere.earth>
In-Reply-To: <7v7j9b7922.fsf@assigned-by-dhcp.cox.net>

On Sat, Jan 07, 2006 at 06:22:29PM -0800, Junio C Hamano wrote:
> Yann Dirson <ydirson@altern.org> writes:
> 
> > +export GIT_AUTHOR_EMAIL=bogus_email_address
> 
> This is probably not needed for this test, although it would not
> hurt.

Inheritance from t3400 :)

> > +test_expect_success \
> > +    'rebase topic branch against new master and check git-am did not get halted' \
> > +    'sh -x git-rebase master &&
> > +     test ! -d .dotest
> > +'
> 
> Some people build git with SHELL_PATH=/bin/bash because their
> /bin/sh is not POSIX enough (e.g. Solaris).  Perhaps emulate
> what t5501 does?

Oh, that "sh -x" is only a forgotten debugging item, I'll drop it.

-- 
Yann Dirson    <ydirson@altern.org> |
Debian-related: <dirson@debian.org> |   Support Debian GNU/Linux:
                                    |  Freedom, Power, Stability, Gratis
     http://ydirson.free.fr/        | Check <http://www.debian.org/>