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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Junio C Hamano <gitster@xxxxxxxxx> 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' '



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux