Re: [PATCH v3 1/6] t6300 (for-each-ref): clearly demarcate setup

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Nov 16, 2013, 23:11 UTC
Message-ID: <CAPig+cRz3_JSLJCu5AndSnreT91OqcQf_p+9-bUE5MUO_E066g@mail.gmail.com>
In-Reply-To: <1384513148-22633-2-git-send-email-artagnon@gmail.com>

On Fri, Nov 15, 2013 at 5:59 AM, Ramkumar Ramachandra <artagnon@gmail.com> wrote:

Show 24 quoted lines

> Condense the two-step setup into one step, and give it an appropriate
> name.
>
> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
> ---
>  t/t6300-for-each-ref.sh | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
> index 752f5cb..72d282f 100755
> --- a/t/t6300-for-each-ref.sh
> +++ b/t/t6300-for-each-ref.sh
> @@ -18,16 +18,13 @@ setdate_and_increment () {
>      export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
>  }
>
> -test_expect_success 'Create sample commit with known timestamp' '
> +test_expect_success setup '
>         setdate_and_increment &&
>         echo "Using $datestamp" > one &&
>         git add one &&
>         git commit -m "Initial" &&
>         setdate_and_increment &&
>         git tag -a -m "Tagging at $datestamp" testtag

Broken &&-chain here after these functions are combined.

Show 8 quoted lines

> -'
> -
> -test_expect_success 'Create upstream config' '
>         git update-ref refs/remotes/origin/master master &&
>         git remote add origin nowhere &&
>         git config branch.master.remote origin &&
> --
> 1.8.5.rc0.6.gfd75b41