From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Mon, 04 Oct 2010 03:37:16 GMT
Subject: Re: [PATCHv6 01/16] test-lib: make test_expect_code a test command
Message-ID: <AANLkTi=4_KN858sfXy59xgUSTCtj9ZkvW3+MrX3w3wWg@mail.gmail.com>
In-Reply-To: <1286136014-7728-2-git-send-email-newren@gmail.com>

On Sun, Oct 3, 2010 at 19:59, Elijah Newren <newren@gmail.com> wrote:
> From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
>
> Change test_expect_code to be a normal test command instead of a
> top-level command.

> [...]

> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> Acked-by: Jonathan Nieder <jrnieder@gmail.com>
> Signed-off-by: Elijah Newren <newren@gmail.com>
> ---
>  t/README                |   16 +++++++------
>  t/t0000-basic.sh        |   55 ++++++++++++++++++++++++++++++++++++++--------
>  t/t1504-ceiling-dirs.sh |    5 ++-
>  t/t6020-merge-df.sh     |    4 ++-
>  t/test-lib.sh           |   40 ++++++++++++++++++---------------
>  5 files changed, 82 insertions(+), 38 deletions(-)

This doc change looks. Here's the diff against my patch for reference:

    diff --git a/t/README b/t/README
    index c216e8c..ee4c0cf 100644
    --- a/t/README
    +++ b/t/README
    @@ -475,10 +475,10 @@ library for your script to use.
                'Perl API' \
                "$PERL_PATH" "$TEST_DIRECTORY"/t9700/test.pl

    - - test_expect_code <exit-code> <git-command>
    + - test_expect_code <exit-code> <command>

    -   Run a git command and ensure that it exits with the given exit
    -   code. For example:
    +   Run a command and ensure that it exits with the given exit code.
    +   For example:

            test_expect_success 'Merge with d/f conflicts' '
                    test_expect_code 1 git merge "merge msg" B master