From: Eric Sunshine <sunshine@sunshineco.com>
Date: Fri, 21 Jun 2013 22:53:53 GMT
Subject: Re: [PATCH 13/16] t/t5505-remote: test multiple push/pull in remotes-file
Message-ID: <CAPig+cSYC4Qv8n_Ly0kWbKho77eJsGxiKZgRCE9XR668vZ92wQ@mail.gmail.com>
In-Reply-To: <1371813160-4200-14-git-send-email-artagnon@gmail.com>

On Fri, Jun 21, 2013 at 7:12 AM, Ramkumar Ramachandra
<artagnon@gmail.com> wrote:
> Extend the test "migrate a remote from named file in $GIT_DIR/remotes"
> to test that multiple "Push:" and "Pull:" lines in the remotes-file
> works as expected.
>
> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
> ---
> diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
> index 06ed381..5497a23 100755
> --- a/t/t5505-remote.sh
> +++ b/t/t5505-remote.sh
> @@ -684,8 +686,18 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
>                 git remote rename origin origin &&
>                 test_path_is_missing .git/remotes/origin &&
>                 test "$(git config remote.origin.url)" = "quux" &&
> -               test "$(git config remote.origin.push)" = "refs/heads/master:refs/heads/upstream" &&
> -               test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin"
> +               cat >push_expected <<-\EOF

Broken &&-chain.

> +               refs/heads/master:refs/heads/upstream
> +               refs/heads/master:refs/heads/upstream2
> +               EOF
> +               cat >fetch_expected <<-\EOF

Ditto.

> +               refs/heads/master:refs/heads/origin
> +               refs/heads/master:refs/heads/origin2
> +               EOF
> +               git config --get-all remote.origin.fetch >push_actual &&
> +               git config --get-all remote.origin.fetch >fetch_actual &&
> +               test_cmp push_expected push_actual &&
> +               test_cmp fetch_expected fetch_actual &&
>         )
>  '
>
> --