From: Junio C Hamano <gitster@pobox.com>
To: Clemens Buchacher <drizzd@aon.at>
Cc: git@vger.kernel.org, "Jeff King" <peff@peff.net>,
"Zbigniew Jędrzejewski-Szmek" <zbyszek@in.waw.pl>
Subject: Re: [PATCH] t5570: use explicit push refspec
Date: Sat, 14 Apr 2012 16:40:01 -0700 [thread overview]
Message-ID: <7viph1288e.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20120414183225.GB3915@ecki> (Clemens Buchacher's message of "Sat, 14 Apr 2012 20:32:25 +0200")
Clemens Buchacher <drizzd@aon.at> writes:
> The default mode for push without arguments will change. Some warnings
> are about to be enabled for such use, which causes some t5570 tests to
> fail because they do not expect this output. Fix this by passing an
> explicit refspec to git push.
I wonder if a better fix is to configure "push.default = matching" in the
test repository. Otherwise wouldn't the result of the push change once
the default changes?
> Signed-off-by: Clemens Buchacher <drizzd@aon.at>
> ---
>
> On Sat, Apr 14, 2012 at 08:29:07PM +0200, Clemens Buchacher wrote:
>>
>> Note that t5570 fails on current pu, because of the push.default
>> warnings. I am sending an independent patch for that.
>
> Here we go.
>
> t/t5570-git-daemon.sh | 30 ++++++++++++++----------------
> 1 file changed, 14 insertions(+), 16 deletions(-)
>
> diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
> index 7cbc999..a3a4e47 100755
> --- a/t/t5570-git-daemon.sh
> +++ b/t/t5570-git-daemon.sh
> @@ -103,14 +103,12 @@ test_remote_error()
> esac
> done
>
> - if test $# -ne 3
> - then
> - error "invalid number of arguments"
> - fi
> -
> + msg=$1
> + shift
> cmd=$1
> - repo=$2
> - msg=$3
> + shift
> + repo=$1
> + shift || error "invalid number of arguments"
>
> if test -x "$GIT_DAEMON_DOCUMENT_ROOT_PATH/$repo"
> then
> @@ -122,7 +120,7 @@ test_remote_error()
> fi
> fi
>
> - test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" 2>output &&
> + test_must_fail git "$cmd" "$GIT_DAEMON_URL/$repo" "$@" 2>output &&
> echo "fatal: remote error: $msg: /$repo" >expect &&
> test_cmp expect output
> ret=$?
> @@ -131,18 +129,18 @@ test_remote_error()
> }
>
> msg="access denied or repository not exported"
> -test_expect_success 'clone non-existent' "test_remote_error clone nowhere.git '$msg'"
> -test_expect_success 'push disabled' "test_remote_error push repo.git '$msg'"
> -test_expect_success 'read access denied' "test_remote_error -x fetch repo.git '$msg'"
> -test_expect_success 'not exported' "test_remote_error -n fetch repo.git '$msg'"
> +test_expect_success 'clone non-existent' "test_remote_error '$msg' clone nowhere.git "
> +test_expect_success 'push disabled' "test_remote_error '$msg' push repo.git master"
> +test_expect_success 'read access denied' "test_remote_error -x '$msg' fetch repo.git "
> +test_expect_success 'not exported' "test_remote_error -n '$msg' fetch repo.git "
>
> stop_git_daemon
> start_git_daemon --informative-errors
>
> -test_expect_success 'clone non-existent' "test_remote_error clone nowhere.git 'no such repository'"
> -test_expect_success 'push disabled' "test_remote_error push repo.git 'service not enabled'"
> -test_expect_success 'read access denied' "test_remote_error -x fetch repo.git 'no such repository'"
> -test_expect_success 'not exported' "test_remote_error -n fetch repo.git 'repository not exported'"
> +test_expect_success 'clone non-existent' "test_remote_error 'no such repository' clone nowhere.git "
> +test_expect_success 'push disabled' "test_remote_error 'service not enabled' push repo.git master"
> +test_expect_success 'read access denied' "test_remote_error -x 'no such repository' fetch repo.git "
> +test_expect_success 'not exported' "test_remote_error -n 'repository not exported' fetch repo.git "
>
> stop_git_daemon
> test_done
next prev parent reply other threads:[~2012-04-14 23:40 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-14 18:29 [PATCH] git-daemon wrapper to wait until daemon is ready Clemens Buchacher
2012-04-14 18:32 ` [PATCH] t5570: use explicit push refspec Clemens Buchacher
2012-04-14 23:40 ` Junio C Hamano [this message]
2012-04-15 0:11 ` Clemens Buchacher
2012-04-15 19:20 ` Junio C Hamano
2012-04-15 19:52 ` Clemens Buchacher
2012-04-15 20:18 ` Junio C Hamano
2012-04-14 18:43 ` [PATCH] git-daemon wrapper to wait until daemon is ready Ben Walton
2012-04-14 19:00 ` Clemens Buchacher
2012-04-14 19:16 ` [PATCH v2] " Clemens Buchacher
2012-04-14 19:36 ` [PATCH] " Johannes Sixt
2012-04-14 22:06 ` Clemens Buchacher
2012-04-15 11:53 ` [PATCH v3] " Clemens Buchacher
2012-04-16 15:46 ` Zbigniew Jędrzejewski-Szmek
2012-04-19 15:00 ` Junio C Hamano
2012-04-15 17:11 ` [PATCH] " Johannes Sixt
2012-04-15 19:32 ` Clemens Buchacher
2012-04-15 19:57 ` Johannes Sixt
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=7viph1288e.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=drizzd@aon.at \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=zbyszek@in.waw.pl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).