From: "Rubén Justo" <rjusto@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git List <git@vger.kernel.org>, Patrick Steinhardt <ps@pks.im>
Subject: Re: [PATCH v3] format-patch: assume --cover-letter for diff in multi-patch series
Date: Wed, 5 Jun 2024 23:24:53 +0200 [thread overview]
Message-ID: <5aebe520-e540-46b4-a887-af488fe2663a@gmail.com> (raw)
In-Reply-To: <xmqqr0dbqfv8.fsf@gitster.g>
On Wed, Jun 05, 2024 at 01:44:27PM -0700, Junio C Hamano wrote:
> > +test_expect_success "format-patch --range-diff, implicit --cover-letter" '
> > + 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
> > +'
>
> Isn't this doing three separate things in a single test? Unless it
> is the local convention in this script, let's split them to three.
Honestly, I don't have a strong opinion on this. I know, though, there
are others who like to pack as much as possible into one test.
I see your point. However, I can also accept that testing in the same
test the simple exceptions for the implicit --cover-letter with
--range-diff, or --interdiff in the other one below, makes sense.
> If "--no-cover-letter" fails to prevent v2-* files from getting
> created, it would fail without hitting test_when_finished. v2 was
> already bad enough in that regard, but piling two more things that
> could fail on top is making it even worse, no?
I'm curious, a test like:
test_expect_success "format-patch --range-diff, implicit --cover-letter" '
test_when_finished "rm v2-000?-*" &&
test_must_fail git format-patch --no-cover-letter
-v2 --range-diff=topic main..unmodified
isn't it confusing?
Thanks.
> > diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
> > index ba85b582c5..b96348eebd 100755
> > --- a/t/t4014-format-patch.sh
> > +++ b/t/t4014-format-patch.sh
> > @@ -2492,6 +2492,16 @@ test_expect_success 'interdiff: solo-patch' '
> > test_cmp expect actual
> > '
> >
> > +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 &&
> > + 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 'format-patch does not respect diff.noprefix' '
> > git -c diff.noprefix format-patch -1 --stdout >actual &&
> > grep "^--- a/blorp" actual
next prev parent reply other threads:[~2024-06-05 21:24 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 [this message]
2024-06-05 21:52 ` Junio C Hamano
2024-06-05 21:39 ` Rubén Justo
2024-06-07 16:29 ` [PATCH v4 0/2] " Rubén Justo
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=5aebe520-e540-46b4-a887-af488fe2663a@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).