Re: [PATCH v4] am: Allow passing --no-verify flag

From: Thierry Reding <thierry.reding@gmail.com>
Date: Dec 21, 2022, 09:20 UTC
Message-ID: <Y6LP+fCMmP33T6Cx@orome>
In-Reply-To: <xmqqlenst021.fsf@gitster.g>

On Thu, Dec 01, 2022 at 09:55:18AM +0900, Junio C Hamano wrote:

Show 7 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
> 
> > ...
> > The same comment as the previous one applies to "test_cmp_rev second"
> > check.  I think removing them would make the tests better.
> 
> I will queue this on top for now.  Thanks.

Just to clarify: do you want me to send out another version with your changes on top or should I consider this done?

Thierry

Show 29 quoted lines

> 
>  t/t4150-am.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git i/t/t4150-am.sh w/t/t4150-am.sh
> index d77c4dcefe..50b257e43f 100755
> --- i/t/t4150-am.sh
> +++ w/t/t4150-am.sh
> @@ -356,7 +356,6 @@ test_expect_success 'am with failing applypatch-msg hook (no verify)' '
>  	git am --no-verify patch1 &&
>  	test_path_is_missing .git/rebase-apply &&
>  	git diff --exit-code second &&
> -	test_cmp_rev second HEAD &&
>  	git log -1 --format=format:%B >actual &&
>  	test_cmp msg actual
>  '
> @@ -401,9 +400,10 @@ test_expect_success 'am with failing pre-applypatch hook (no verify)' '
>  	EOF
>  	git am --no-verify patch1 &&
>  	test_path_is_missing .git/rebase-apply &&
> +	test_path_is_file empty-file &&
>  	git diff --exit-code second &&
> -	test_cmp_rev second HEAD &&
> -	test_path_is_file empty-file
> +	git log -1 --format=format:%B >actual &&
> +	test_cmp msg actual
>  '
>  
>  test_expect_success 'am with post-applypatch hook' '