public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Andrew Wheeler <agwheeler@gmail•com>
Cc: git@vger•kernel.org, Andrew Wheeler <awheeler@motorola•com>
Subject: Re: [PATCH v3] push --force-with-lease: Fix ref status reporting
Date: Thu, 28 Jan 2016 15:13:36 -0800	[thread overview]
Message-ID: <xmqqmvrpl2lb.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1454012898-10138-1-git-send-email-agwheeler@gmail.com> (Andrew Wheeler's message of "Thu, 28 Jan 2016 14:28:18 -0600")

Andrew Wheeler <agwheeler@gmail•com> writes:

> diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
> index c402d8d..c65033f 100755
> --- a/t/t5533-push-cas.sh
> +++ b/t/t5533-push-cas.sh
> @@ -101,7 +101,8 @@ test_expect_success 'push to update (allowed, tracking)' '
>  	(
>  		cd dst &&
>  		test_commit D &&
> -		git push --force-with-lease=master origin master
> +		git push --force-with-lease=master origin master 2>err &&
> +		! grep "forced update" err
>  	) &&
>  	git ls-remote dst refs/heads/master >expect &&
>  	git ls-remote src refs/heads/master >actual &&
> @@ -114,7 +115,8 @@ test_expect_success 'push to update (allowed even though no-ff)' '
>  		cd dst &&
>  		git reset --hard HEAD^ &&
>  		test_commit D &&
> -		git push --force-with-lease=master origin master
> +		git push --force-with-lease=master origin master 2>err &&
> +		grep "forced update" err
>  	) &&
>  	git ls-remote dst refs/heads/master >expect &&
>  	git ls-remote src refs/heads/master >actual &&
> @@ -147,7 +149,8 @@ test_expect_success 'push to delete (allowed)' '
>  	setup_srcdst_basic &&
>  	(
>  		cd dst &&
> -		git push --force-with-lease=master origin :master
> +		git push --force-with-lease=master origin :master 2>err &&
> +		grep deleted err
>  	) &&
>  	>expect &&
>  	git ls-remote src refs/heads/master >actual &&

These all look OK (I am not sure about message i18n, though).

Do we not test a case where --force-with-lease push is rejected due
to REF_STATUS_REJECT_STALE?

Thanks.

next prev parent reply	other threads:[~2016-01-28 23:13 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-28 20:28 [PATCH v3] push --force-with-lease: Fix ref status reporting Andrew Wheeler
2016-01-28 23:13 ` Junio C Hamano [this message]
2016-01-29 22:53   ` Andrew Wheeler

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=xmqqmvrpl2lb.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=agwheeler@gmail$(echo .)com \
    --cc=awheeler@motorola$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox