Re: [PATCH 1/1] Add the `p4-pre-submit` hook

[Luke Diamand <luke@diamand.org>]

On 31 July 2018 at 16:40, Junio C Hamano <gitster@pobox.com> wrote:
> Luke Diamand <luke@diamand.org> writes:
>
>> I think there is an error in the test harness.
>>
>> On 31 July 2018 at 10:46, SZEDER Gábor <szeder.dev@gmail.com> wrote:
>>>> +             test_must_fail git-p4 submit --dry-run >errs 2>&1 &&>
>>>> +             ! grep "Would apply" err
>>
>> It writes to the file "errs" but then looks for the message in "err".
>>
>> Luke
>
> Sigh. Thanks for spotting, both of you.
>
> Here is what I'd locally squash in.  If there is anything else, I'd
> rather see a refreshed final one sent by the author.
>
> Thanks.
>
>  t/t9800-git-p4-basic.sh | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
> index 2b7baa95d2..729cd25770 100755
> --- a/t/t9800-git-p4-basic.sh
> +++ b/t/t9800-git-p4-basic.sh
> @@ -274,19 +274,19 @@ test_expect_success 'run hook p4-pre-submit before submit' '
>                 git add hello.txt &&
>                 git commit -m "add hello.txt" &&
>                 git config git-p4.skipSubmitEdit true &&
> -               git-p4 submit --dry-run >out &&
> +               git p4 submit --dry-run >out &&
>                 grep "Would apply" out &&
>                 mkdir -p .git/hooks &&
>                 write_script .git/hooks/p4-pre-submit <<-\EOF &&
>                 exit 0
>                 EOF
> -               git-p4 submit --dry-run >out &&
> +               git p4 submit --dry-run >out &&
>                 grep "Would apply" out &&
>                 write_script .git/hooks/p4-pre-submit <<-\EOF &&
>                 exit 1
>                 EOF
> -               test_must_fail git-p4 submit --dry-run >errs 2>&1 &&
> -               ! grep "Would apply" err
> +               test_must_fail git p4 submit --dry-run >errs 2>&1 &&
> +               ! grep "Would apply" errs
>         )
>  '

That set of deltas works for me.

Sorry, I should have run the tests myself earlier and I would have
picked up on this.