Re: [PATCH v2 1/2] t3200-branch: test setting branch as own upstream

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 4, 2014, 23:56 UTC
Message-ID: <xmqqmwh5ikl0.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1393569662-68351-1-git-send-email-modocache@gmail.com>

Brian Gesiak <modocache@gmail.com> writes:

Show 24 quoted lines

> No test asserts that "git branch -u refs/heads/my-branch my-branch"
> emits a warning. Add a test that does so.
>
> Signed-off-by: Brian Gesiak <modocache@gmail.com>
> ---
>  t/t3200-branch.sh | 8 ++++++++
>  1 file changed, 8 insertions(+)
>
> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
> index fcdb867..6164126 100755
> --- a/t/t3200-branch.sh
> +++ b/t/t3200-branch.sh
> @@ -507,6 +507,14 @@ EOF
>  	test_cmp expected actual
>  '
>  
> +test_expect_success '--set-upstream-to shows warning if used to set branch as own upstream' '
> +	git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
> +	cat >expected <<EOF &&
> +warning: Not setting branch my13 as its own upstream.
> +EOF
> +	test_i18ncmp expected actual
> +'
> +

Checking the error message is fine, but we are also interested in seeing that we do not leave such a nonsense configuration, if not more. Shouldn't we check the resulting config as well here?

>  # Keep this test last, as it changes the current branch
>  cat >expect <<EOF
>  $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000	branch: Created from master