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

From: chen bin <chenbin.sh@gmail.com>
Date: Aug 1, 2018, 14:57 UTC
Message-ID: <CAAE-R+8UA5S3Y4iWw=njtVVn8cu+7s8E7L9fS6UY=Q_a5-JwwQ@mail.gmail.com>
In-Reply-To: <CAE5ih7-pLAW8xrY_F2z6gDxaMuA4w+nuUQHeLvGdSyn0GXebWA@mail.gmail.com>

I updated the patch. But for some reason the test keep failing at this line, `test_must_fail git p4 submit --dry-run >errs 2>&1 &&`.

If I change this line to `test_must_fail git-p4 submit --dry-run >errs 2>&1 &&` the test will pass.

Could you help me to resolve this issue? I'm really confused. I've already added latest `p4d` and `p4` to $PATH.

The commit is at https://github.com/redguardtoo/git/commit/b88c38b9ce6cfb1c1fefef15527adfa92d78daf2

On Wed, Aug 1, 2018 at 5:54 AM, Luke Diamand <luke@diamand.org> wrote:

Show 55 quoted lines

> 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.

-- 
help me, help you.