From: Paul Tan <pyokagan@gmail.com>
Date: Wed, 06 May 2015 06:06:47 GMT
Subject: Re: [PATCH 2/7] t5520: implement tests for no merge candidates cases
Message-ID: <CACRoPnQMAsy3=VoOkjF61QujPMa0L=WmMXqLHakcoyjxaSRx6g@mail.gmail.com>
In-Reply-To: <CACRoPnQ5EaCmO-tmDxmNW_snFLbFNOq06wdF_p4FPHHv+HiJBA@mail.gmail.com>

On Wed, May 6, 2015 at 2:04 PM, Paul Tan <pyokagan@gmail.com> wrote:
> Ah, I just figured out how to trigger this error. Just for reference,
> before I forget:

Whoops, hit send too early.

The test for case (1) would look something like:

test_expect_success 'fail if not on a branch' '
    git remote add origin . &&
    test_when_finished "git remote rm origin" &&
    git checkout HEAD^{} &&
    test_when_finished "git checkout -f copy" &&
    test_must_fail git pull 2>out &&
    test_i18ngrep "You are not currently on a branch" out
'