Re: [PATCH] request-pull: resurrect for-linus -> tags/for-linus DWIM
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 2, 2014, 18:05 UTC
- Message-ID
- <xmqqfvjn5grm.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <538C2290.3060506@viscovery.net>
Johannes Sixt <j.sixt@viscovery.net> writes:
Show 23 quoted lines
> 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
Thanks for catching; I do not think the "brown paper bag" is too strong ;-)
Show 24 quoted lines
> 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' '