From: Johannes Sixt <j.sixt@viscovery.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>
Subject: Re: [PATCH] request-pull: resurrect for-linus -> tags/for-linus DWIM
Date: Mon, 02 Jun 2014 09:06:56 +0200 [thread overview]
Message-ID: <538C2290.3060506@viscovery.net> (raw)
In-Reply-To: <1400263070-15312-1-git-send-email-gitster@pobox.com>
Am 5/16/2014 19:57, schrieb Junio C Hamano:
> --- a/t/t5150-request-pull.sh
> +++ b/t/t5150-request-pull.sh
> @@ -223,7 +223,13 @@ test_expect_success 'pull request format' '
> git request-pull initial "$downstream_url" tags/full:refs/tags/full
> ) >request &&
> sed -nf fuzz.sed <request >request.fuzzy &&
> - test_i18ncmp expect request.fuzzy
> + test_i18ncmp expect request.fuzzy &&
> +
> + (
> + cd local &&
> + git request-pull initial "$downstream_url" full
> + ) >request &&
> + grep ' tags/full$'
> '
What's this crap? Here's a fix. Feel free to tame down the subject line
if you think it's too strong ;)
--- 8< ---
From: Johannes Sixt <j6t@kdbg.org>
Subject: [PATCH] fix brown paper bag breakage in t5150-request-pull.sh
The recent addition to the test case 'pull request format' interrupted
the single-quoted text, effectively adding a third argument to the
test_expect_success command. Since we do not have a prerequisite named
"pull request format", the test is skipped, no matter what. Additionally,
the file name argument to the grep command is missing. Fix both issues.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
t/t5150-request-pull.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
index 93e2c65..82c33b8 100755
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@ -229,7 +229,7 @@ test_expect_success 'pull request format' '
cd local &&
git request-pull initial "$downstream_url" full
) >request &&
- grep ' tags/full$'
+ grep " tags/full\$" request
'
test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' '
--
2.0.0.1326.g81a507a
next prev parent reply other threads:[~2014-06-02 7:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-16 17:57 [PATCH] request-pull: resurrect for-linus -> tags/for-linus DWIM Junio C Hamano
2014-05-18 8:33 ` Michael S. Tsirkin
2014-05-19 16:30 ` Junio C Hamano
2014-06-02 7:06 ` Johannes Sixt [this message]
2014-06-02 18:05 ` 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=538C2290.3060506@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mst@redhat.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.