git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Dragan Simic <dsimic@manjaro.org>
To: git@vger.kernel.org
Subject: [PATCH 4/4] t4014: add tests to cover --resend option and its exclusivity
Date: Wed, 17 Apr 2024 05:32:44 +0200	[thread overview]
Message-ID: <42865d6c6694b9e6b745c328d717ed244dc25a1a.1713324598.git.dsimic@manjaro.org> (raw)
In-Reply-To: <cover.1713324598.git.dsimic@manjaro.org>

Add a few new tests to the t4014 that cover the --resend command-line option
for "git format-patch", which include the tests for its exclusivity with the
already existing -k and --rfc command-line options.

Signed-off-by: Dragan Simic <dsimic@manjaro.org>
---
 t/t4014-format-patch.sh | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index e22c4ac34e6e..bcf7b633e78f 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -1401,6 +1401,43 @@ test_expect_success '--rfc and -k cannot be used together' '
 	test_must_fail git format-patch -1 --stdout --rfc -k >patch
 '
 
+test_expect_success '--resend' '
+	cat >expect <<-\EOF &&
+	Subject: [PATCH RESEND 1/1] header with . in it
+	EOF
+	git format-patch -n -1 --stdout --resend >patch &&
+	grep "^Subject:" patch >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--resend does not overwrite prefix' '
+	cat >expect <<-\EOF &&
+	Subject: [PATCH RFC RESEND 1/1] header with . in it
+	EOF
+	git -c format.subjectPrefix="PATCH RFC" \
+		format-patch -n -1 --stdout --resend >patch &&
+	grep "^Subject:" patch >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--resend is argument order independent' '
+	cat >expect <<-\EOF &&
+	Subject: [PATCH RFC RESEND 1/1] header with . in it
+	EOF
+	git format-patch -n -1 --stdout --resend \
+		--subject-prefix="PATCH RFC" >patch &&
+	grep "^Subject:" patch >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--resend and -k cannot be used together' '
+	test_must_fail git format-patch -1 --stdout --resend -k >patch
+'
+
+test_expect_success '--rfc and --resend cannot be used together' '
+	test_must_fail git format-patch -1 --stdout --rfc --resend >patch
+'
+
 test_expect_success '--from=ident notices bogus ident' '
 	test_must_fail git format-patch -1 --stdout --from=foo >patch
 '


  parent reply	other threads:[~2024-04-17  3:33 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-17  3:32 [PATCH 0/4] format-patch: fix an option coexistence bug and add new --resend option Dragan Simic
2024-04-17  3:32 ` [PATCH 1/4] format-patch docs: avoid use of parentheses to improve readability Dragan Simic
2024-04-17  3:32 ` [PATCH 2/4] format-patch: fix a bug in option exclusivity and add a test to t4014 Dragan Simic
2024-04-17  6:15   ` Eric Sunshine
2024-04-17  6:29     ` Dragan Simic
2024-04-17  6:27   ` Patrick Steinhardt
2024-04-17  6:56     ` Dragan Simic
2024-04-18  9:12       ` Dragan Simic
2024-04-17  6:33   ` Kristoffer Haugsbakk
2024-04-17  6:40     ` Eric Sunshine
2024-04-17  7:11       ` Dragan Simic
2024-04-17 11:38         ` Kristoffer Haugsbakk
2024-04-17 11:48           ` Dragan Simic
2024-04-17  6:54     ` Dragan Simic
2024-04-17 12:00     ` Dragan Simic
2024-04-17  3:32 ` [PATCH 3/4] format-patch: new --resend option for adding "RESEND" to patch subjects Dragan Simic
2024-04-17  6:14   ` Kristoffer Haugsbakk
2024-04-17  6:36     ` Dragan Simic
2024-04-17  6:43       ` Kristoffer Haugsbakk
2024-04-17  7:16         ` Dragan Simic
2024-04-17  6:35   ` Eric Sunshine
2024-04-17  7:05     ` Dragan Simic
2024-04-17  7:17       ` Eric Sunshine
2024-04-17  7:25         ` Dragan Simic
2024-04-18 20:04       ` Dragan Simic
2024-04-17 10:02   ` Phillip Wood
2024-04-17 10:52     ` Dragan Simic
2024-04-17 11:31       ` Kristoffer Haugsbakk
2024-04-17 11:34         ` Dragan Simic
2024-04-17 11:40           ` Kristoffer Haugsbakk
2024-04-17 11:43           ` Dragan Simic
2024-04-17 15:27     ` Junio C Hamano
2024-04-17 17:34       ` Dragan Simic
2024-04-17 21:03         ` Junio C Hamano
2024-04-17 21:09           ` Dragan Simic
2024-04-18  3:12             ` Dragan Simic
2024-04-18 22:34               ` Junio C Hamano
2024-04-19  0:08                 ` Dragan Simic
2024-04-19  0:15                 ` Eric Sunshine
2024-04-19  0:45                   ` Dragan Simic
2024-04-19  3:05                     ` Eric Sunshine
2024-04-19  2:13                   ` Junio C Hamano
2024-04-19  3:07                     ` Eric Sunshine
2024-04-19 16:21                       ` Junio C Hamano
2024-04-17  3:32 ` Dragan Simic [this message]
2024-04-17  6:48   ` [PATCH 4/4] t4014: add tests to cover --resend option and its exclusivity Eric Sunshine
2024-04-17  7:20     ` Dragan Simic
2024-04-17  6:02 ` [PATCH 0/4] format-patch: fix an option coexistence bug and add new --resend option Eric Sunshine
2024-04-17  6:07   ` Dragan Simic
2024-04-17  6:23     ` Eric Sunshine
2024-04-17  6:43       ` Dragan Simic

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=42865d6c6694b9e6b745c328d717ed244dc25a1a.1713324598.git.dsimic@manjaro.org \
    --to=dsimic@manjaro.org \
    --cc=git@vger.kernel.org \
    /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).