From: "Rubén Justo" <rjusto@gmail.com>
To: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Cc: Patrick Steinhardt <ps@pks.im>
Subject: [PATCH v4 0/2] format-patch: assume --cover-letter for diff in multi-patch series
Date: Fri, 7 Jun 2024 18:29:06 +0200 [thread overview]
Message-ID: <9f520828-f87e-49b1-aa4b-c00ec6bb0133@gmail.com> (raw)
In-Reply-To: <cb6b6d54-959f-477d-83e5-027c81ae85de@gmail.com>
This iteration incorporates the changes to the tests suggested in the
reviews from the previous iteration.
The main change is to split the tests proposed in the previous iteration
into several separate tests; separating the functionality that checks
when `--cover-letter` is implicitly assumed, from the tests that check
when this implicit assumption is avoided.
The new patch in the series, [1/2], is a preparation patch that reorders
the way `test_when_finished` is used in t4014, making it more reasonable
and logical.
Thanks.
Rubén Justo (2):
t4014: cleanups in a few tests
format-patch: assume --cover-letter for diff in multi-patch series
builtin/log.c | 2 ++
t/t3206-range-diff.sh | 14 ++++++++++++++
t/t4014-format-patch.sh | 25 ++++++++++++++++++++-----
3 files changed, 36 insertions(+), 5 deletions(-)
Range-diff against v3:
-: ---------- > 1: 678bae2e42 t4014: cleanups in a few tests
1: 78aeff9016 ! 2: d1e9f8561b format-patch: assume --cover-letter for diff in multi-patch series
@@ t/t3206-range-diff.sh: do
'
done
-+test_expect_success "format-patch --range-diff, implicit --cover-letter" '
++test_expect_success "--range-diff implies --cover-letter for multi-patch series" '
++ test_when_finished "rm -f v2-000?-*" &&
++ git format-patch -v2 --range-diff=topic main..unmodified &&
++ test_grep "^Range-diff against v1:$" v2-0000-cover-letter.patch
++'
++
++test_expect_success "explicit --no-cover-letter defeats implied --cover-letter" '
++ test_when_finished "rm -f v2-000?-*" &&
+ test_must_fail git format-patch --no-cover-letter \
+ -v2 --range-diff=topic main..unmodified &&
+ test_must_fail git -c format.coverLetter=no format-patch \
-+ -v2 --range-diff=topic main..unmodified &&
-+ git format-patch -v2 --range-diff=topic main..unmodified &&
-+ test_when_finished "rm v2-000?-*" &&
-+ test_grep "^Range-diff against v1:$" v2-0000-cover-letter.patch
++ -v2 --range-diff=topic main..unmodified
+'
+
test_expect_success 'format-patch --range-diff as commentary' '
@@ t/t4014-format-patch.sh: test_expect_success 'interdiff: solo-patch' '
'
+test_expect_success 'interdiff: multi-patch, implicit --cover-letter' '
-+ test_must_fail git format-patch --no-cover-letter \
-+ --interdiff=boop~2 -2 -v23 &&
-+ test_must_fail git -c format.coverLetter=no format-patch \
-+ --interdiff=boop~2 -2 -v23 &&
++ test_when_finished "rm -f v23-0*.patch" &&
+ git format-patch --interdiff=boop~2 -2 -v23 &&
+ test_grep "^Interdiff against v22:$" v23-0000-cover-letter.patch &&
+ test_cmp expect actual
+'
++
++test_expect_success 'interdiff: explicit --no-cover-letter defeats implied --cover-letter' '
++ test_when_finished "rm -f v23-0*.patch" &&
++ test_must_fail git format-patch --no-cover-letter \
++ --interdiff=boop~2 -2 -v23 &&
++ test_must_fail git -c format.coverLetter=no format-patch \
++ --interdiff=boop~2 -2 -v23
++'
+
test_expect_success 'format-patch does not respect diff.noprefix' '
git -c diff.noprefix format-patch -1 --stdout >actual &&
--
2.45.2.23.gd1e9f8561b
next prev parent reply other threads:[~2024-06-07 16:29 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-03 22:49 [PATCH] format-patch: assume --cover-letter for diff in multi-patch series Rubén Justo
2024-06-04 8:02 ` Patrick Steinhardt
2024-06-04 17:32 ` Junio C Hamano
2024-06-05 18:01 ` Rubén Justo
2024-06-05 18:17 ` Junio C Hamano
2024-06-05 18:58 ` Junio C Hamano
2024-06-05 20:27 ` [PATCH v3] " Rubén Justo
2024-06-05 20:44 ` Junio C Hamano
2024-06-05 21:24 ` Rubén Justo
2024-06-05 21:52 ` Junio C Hamano
2024-06-05 21:39 ` Rubén Justo
2024-06-07 16:29 ` Rubén Justo [this message]
2024-06-07 16:30 ` [PATCH v4 1/2] t4014: cleanups in a few tests Rubén Justo
2024-06-07 17:14 ` Junio C Hamano
2024-06-07 17:38 ` Rubén Justo
2024-06-07 18:57 ` Junio C Hamano
2024-06-07 16:30 ` [PATCH v4 2/2] format-patch: assume --cover-letter for diff in multi-patch series Rubén Justo
2024-06-07 20:52 ` [PATCH v5 0/2] " Rubén Justo
2024-06-07 20:55 ` [PATCH v5 1/2] t4014: cleanups in a few tests Rubén Justo
2024-06-07 20:55 ` [PATCH v5 2/2] format-patch: assume --cover-letter for diff in multi-patch series Rubén Justo
2024-06-07 21:10 ` [PATCH v5 0/2] " 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=9f520828-f87e-49b1-aa4b-c00ec6bb0133@gmail.com \
--to=rjusto@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ps@pks.im \
/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 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 NNTP newsgroup(s).