git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yann Dirson <ydirson@altern.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 4/7] Add a test for rebase when a change was picked upstream
Date: Sun, 8 Jan 2006 11:01:59 +0100	[thread overview]
Message-ID: <20060108100159.GE32585@nowhere.earth> (raw)
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/>

      reply	other threads:[~2006-01-08  9:59 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-01-08  0:39 [PATCH 4/7] Add a test for rebase when a change was picked upstream Yann Dirson
2006-01-08  2:22 ` Junio C Hamano
2006-01-08 10:01   ` Yann Dirson [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20060108100159.GE32585@nowhere.earth \
    --to=ydirson@altern.org \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).