From: Firmin Martin <firminmartin24@gmail.com>
To: Firmin Martin <firminmartin24@gmail.com>, git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Johannes Schindelin <johannes.schindelin@gmail.com>,
Erik Faye-Lund <kusmabite@gmail.com>,
Denton Liu <liu.denton@gmail.com>
Subject: [PATCH v1 5/8] t4014: test patches overwrite confirmation
Date: Thu, 6 May 2021 18:50:59 +0200 [thread overview]
Message-ID: <20210506165102.123739-6-firminmartin24@gmail.com> (raw)
In-Reply-To: <20210506165102.123739-1-firminmartin24@gmail.com>
Signed-off-by: Firmin Martin <firminmartin24@gmail.com>
---
t/t4014-format-patch.sh | 123 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 123 insertions(+)
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 712d4b5ddf..cf7e48f4de 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -2256,6 +2256,129 @@ test_expect_success 'format-patch --pretty=mboxrd' '
test_cmp expect actual
'
+# $1 = git format-patch extra arguments
+confirm_overwrite_setup () {
+ test_when_finished "rm -rf confirm-overwrite" &&
+ git format-patch $1 -o confirm-overwrite main..side &&
+ for patch in confirm-overwrite/*; do echo 'APPENDUM' >>$patch; done
+}
+
+# $1 = format.confirmOverwrite value
+# $2 = git format-patch extra arguments
+# $3 = git format-patch with prompt (Y/N) or without it
+confirm_overwrite_test_body () {
+ if test ! -z $1;
+ then
+ test_config format.confirmOverwrite $1
+ fi &&
+ case "$3" in
+ Y)
+ echo Y | git format-patch $2 -o confirm-overwrite main..side
+ ;;
+ N)
+ echo N | test_must_fail git format-patch $2 -o confirm-overwrite main..side
+ ;;
+ *)
+ git format-patch $2 -o confirm-overwrite main..side
+ ;;
+ esac
+}
+
+# true if all patches are overwritten, false otherwise
+confirm_overwrite_all_overwritten () {
+ for patch in confirm-overwrite/*; do test_i18ngrep ! "^APPENDUM$" $patch; done
+}
+
+test_expect_success 'format-patch overwrite unconditionally patch series without cover letter' '
+ confirm_overwrite_setup &&
+ confirm_overwrite_test_body &&
+ confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch overwrites present cover letter (prompt/Y)' '
+ confirm_overwrite_setup "--cover-letter" &&
+ confirm_overwrite_test_body "" "--cover-letter" "Y" &&
+ confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch does not overwrite present cover letter (prompt/N)' '
+ confirm_overwrite_setup "--cover-letter" &&
+ confirm_overwrite_test_body "" "--cover-letter" "N" &&
+ ! confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch --numbered-files overwrites existing cover letter (prompt/Y)' '
+ confirm_overwrite_setup "--cover-letter --numbered-files" &&
+ confirm_overwrite_test_body "" "--cover-letter --numbered-files" "Y" &&
+ confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch --numbered-files does not overwrite existing cover letter (prompt/N)' '
+ confirm_overwrite_setup "--cover-letter --numbered-files" &&
+ confirm_overwrite_test_body "" "--cover-letter --numbered-files" "N" &&
+ ! confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch overwrites existing cover letter (format.confirmOverwrite = never)' '
+ confirm_overwrite_setup "--cover-letter" &&
+ confirm_overwrite_test_body "never" "--cover-letter" &&
+ confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch: the user disagrees to overwrite existing cover letter (format.confirmOverwrite = always)' '
+ confirm_overwrite_setup "--cover-letter" &&
+ confirm_overwrite_test_body "always" "--cover-letter" "N" &&
+ ! confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch: the user agrees to overwrite existing cover letter (format.confirmOverwrite = always)' '
+ confirm_overwrite_setup "--cover-letter" &&
+ confirm_overwrite_test_body "always" "--cover-letter" "Y" &&
+ confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch --confirm-overwrite has higher priority than format.confirmOverwrite' '
+ confirm_overwrite_setup &&
+ confirm_overwrite_test_body "always" "--confirm-overwrite never" &&
+ confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch --confirm-overwrite cover: the user agrees to overwrite existing cover letter' '
+ confirm_overwrite_setup "--cover-letter" &&
+ confirm_overwrite_test_body "never" "--cover-letter --confirm-overwrite cover" "Y" &&
+ confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch --confirm-overwrite cover: the user disagrees to overwrite existing cover letter' '
+ confirm_overwrite_setup "--cover-letter" &&
+ confirm_overwrite_test_body "never" "--cover-letter --confirm-overwrite cover" "N" &&
+ ! confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch --confirm-overwrite always: the user agrees to overwrite existing patches' '
+ confirm_overwrite_setup &&
+ confirm_overwrite_test_body "never" "--confirm-overwrite always" "Y" &&
+ confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch --confirm-overwrite always: the user disagrees to overwrite existing patches' '
+ confirm_overwrite_setup &&
+ confirm_overwrite_test_body "never" "--confirm-overwrite always" "N" &&
+ ! confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch --confirm-overwrite never: overwrite cover letter unconditionally' '
+ confirm_overwrite_setup "--cover-letter" &&
+ confirm_overwrite_test_body "always" "--cover-letter --confirm-overwrite never" &&
+ confirm_overwrite_all_overwritten
+'
+
+test_expect_success 'format-patch --confirm-overwrite never: overwrite patches unconditionally' '
+ confirm_overwrite_setup &&
+ confirm_overwrite_test_body "always" "--confirm-overwrite never" &&
+ confirm_overwrite_all_overwritten
+'
+
test_expect_success 'interdiff: setup' '
git checkout -b boop main &&
test_commit fnorp blorp &&
--
2.31.1.449.g4a44fa8106
next prev parent reply other threads:[~2021-05-06 16:52 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-06 16:50 [PATCH v1 0/8] format-patch: introduce --confirm-overwrite Firmin Martin
2021-05-06 16:50 ` [PATCH v1 1/8] compat/terminal: let prompt accept input from pipe Firmin Martin
2021-05-06 23:37 ` Junio C Hamano
2021-05-07 4:54 ` Jeff King
2021-05-07 5:25 ` Junio C Hamano
2021-05-10 4:18 ` Firmin Martin
2021-05-10 21:32 ` Jeff King
2021-05-11 3:38 ` Junio C Hamano
2021-05-11 6:10 ` Jeff King
2021-05-11 6:17 ` Junio C Hamano
2021-05-11 6:37 ` Jeff King
2021-05-06 16:50 ` [PATCH v1 2/8] format-patch: confirmation whenever patches exist Firmin Martin
2021-05-06 23:48 ` Junio C Hamano
2021-05-10 3:30 ` Firmin Martin
2021-05-10 7:32 ` Junio C Hamano
2021-05-11 3:17 ` Firmin Martin
2021-05-06 16:50 ` [PATCH v1 3/8] format-patch: add config option confirmOverwrite Firmin Martin
2021-05-06 16:50 ` [PATCH v1 4/8] format-patch: add the option --confirm-overwrite Firmin Martin
2021-05-06 16:50 ` Firmin Martin [this message]
2021-05-06 16:51 ` [PATCH v1 6/8] t4014: fix tests overwriting cover letter in silent Firmin Martin
2021-05-06 16:51 ` [PATCH v1 7/8] doc/format-patch: describe --confirm-overwrite Firmin Martin
2021-05-07 3:32 ` Bagas Sanjaya
2021-05-10 4:22 ` Firmin Martin
2021-05-06 16:51 ` [PATCH v1 8/8] config/format: describe format.confirmOverwrite Firmin Martin
2021-05-06 22:33 ` [PATCH v1 0/8] format-patch: introduce --confirm-overwrite Junio C Hamano
2021-05-11 0:18 ` Firmin Martin
2021-05-07 1:46 ` Felipe Contreras
2021-05-07 8:55 ` Denton Liu
2021-05-11 1:09 ` Firmin Martin
2021-05-11 5:12 ` Felipe Contreras
2021-05-11 5:03 ` Felipe Contreras
2021-05-07 14:02 ` Sergey Organov
2021-05-11 0:46 ` Firmin Martin
2021-05-10 12:02 ` Ævar Arnfjörð Bjarmason
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=20210506165102.123739-6-firminmartin24@gmail.com \
--to=firminmartin24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmail.com \
--cc=kusmabite@gmail.com \
--cc=liu.denton@gmail.com \
--cc=peff@peff.net \
/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).