These were done to work around older versions of Getopt::Long that did not take negation of a boolean "--option" as "--no-option" (but they happily took "--nooption"). I am inclined to squash this into the previous one. Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx> --- t/t9001-send-email.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index af6a3e8..0513055 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -392,7 +392,7 @@ test_expect_success $PREREQ 'allow long lines with --no-validate' ' --from="Example <nobody@xxxxxxxxxxx>" \ --to=nobody@xxxxxxxxxxx \ --smtp-server="$(pwd)/fake.sendmail" \ - --novalidate \ + --no-validate \ $patches longline.patch \ 2>errors ' @@ -426,7 +426,7 @@ test_expect_success $PREREQ 'In-Reply-To without --chain-reply-to' ' git send-email \ --from="Example <nobody@xxxxxxxxxxx>" \ --to=nobody@xxxxxxxxxxx \ - --nochain-reply-to \ + --no-chain-reply-to \ --in-reply-to="$(cat expect)" \ --smtp-server="$(pwd)/fake.sendmail" \ $patches $patches $patches \ @@ -1067,7 +1067,7 @@ test_expect_success $PREREQ 'in-reply-to but no threading' ' --from="Example <nobody@xxxxxxxxxxx>" \ --to=nobody@xxxxxxxxxxx \ --in-reply-to="<in-reply-id@xxxxxxxxxxx>" \ - --nothread \ + --no-thread \ $patches | grep "In-Reply-To: <in-reply-id@xxxxxxxxxxx>" ' @@ -1077,7 +1077,7 @@ test_expect_success $PREREQ 'no in-reply-to and no threading' ' --dry-run \ --from="Example <nobody@xxxxxxxxxxx>" \ --to=nobody@xxxxxxxxxxx \ - --nothread \ + --no-thread \ $patches $patches >stdout && ! grep "In-Reply-To: " stdout ' @@ -1088,7 +1088,7 @@ test_expect_success $PREREQ 'threading but no chain-reply-to' ' --from="Example <nobody@xxxxxxxxxxx>" \ --to=nobody@xxxxxxxxxxx \ --thread \ - --nochain-reply-to \ + --no-chain-reply-to \ $patches $patches >stdout && grep "In-Reply-To: " stdout ' -- 2.3.0-191-geb1a277 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html