From: Thierry Reding <thierry.reding@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Taylor Blau <me@ttaylorr.com>
Subject: Re: [PATCH v4] am: Allow passing --no-verify flag
Date: Wed, 21 Dec 2022 10:20:57 +0100 [thread overview]
Message-ID: <Y6LP+fCMmP33T6Cx@orome> (raw)
In-Reply-To: <xmqqlenst021.fsf@gitster.g>
[-- Attachment #1: Type: text/plain, Size: 1454 bytes --]
On Thu, Dec 01, 2022 at 09:55:18AM +0900, Junio C Hamano wrote:
> 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
>
> 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' '
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2022-12-21 9:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 17:28 [PATCH v4] am: Allow passing --no-verify flag Thierry Reding
2022-12-01 0:51 ` Junio C Hamano
2022-12-01 0:55 ` Junio C Hamano
2022-12-21 9:20 ` Thierry Reding [this message]
2022-12-21 9:42 ` Junio C Hamano
2022-12-21 17:21 ` Thierry Reding
2022-12-25 11:26 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y6LP+fCMmP33T6Cx@orome \
--to=thierry.reding@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).