From: Junio C Hamano <gitster@pobox.com>
To: Thierry Reding <thierry.reding@gmail.com>
Cc: git@vger.kernel.org, Taylor Blau <me@ttaylorr.com>
Subject: Re: [PATCH v4] am: Allow passing --no-verify flag
Date: Thu, 01 Dec 2022 09:55:18 +0900 [thread overview]
Message-ID: <xmqqlenst021.fsf@gitster.g> (raw)
In-Reply-To: <xmqqr0xkt07x.fsf@gitster.g> (Junio C. Hamano's message of "Thu, 01 Dec 2022 09:51:46 +0900")
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.
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' '
next prev parent reply other threads:[~2022-12-01 0:55 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 [this message]
2022-12-21 9:20 ` Thierry Reding
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqlenst021.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=thierry.reding@gmail.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.