From: Junio C Hamano <gitster@pobox•com>
To: Brian Gesiak <modocache@gmail•com>
Cc: Jeff King <peff@peff•net>, git@vger•kernel.org
Subject: Re: [PATCH v2 1/2] t3200-branch: test setting branch as own upstream
Date: Tue, 04 Mar 2014 15:56:59 -0800 [thread overview]
Message-ID: <xmqqmwh5ikl0.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1393569662-68351-1-git-send-email-modocache@gmail.com> (Brian Gesiak's message of "Fri, 28 Feb 2014 15:41:02 +0900")
Brian Gesiak <modocache@gmail•com> writes:
> 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
next prev parent reply other threads:[~2014-03-04 23:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-28 6:41 [PATCH v2 1/2] t3200-branch: test setting branch as own upstream Brian Gesiak
2014-03-04 23:56 ` Junio C Hamano [this message]
2014-03-05 7:31 ` [PATCH] " Brian Gesiak
2014-03-06 21:00 ` Jeff King
2014-03-06 21:53 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmwh5ikl0.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=modocache@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox