Re: [PATCH 4/5] send-email: fix regression in sendemail.identity parsing
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- May 29, 2019, 09:10 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1905291106540.44@tvgsbejvaqbjf.bet>
- In-Reply-To
- <nycvar.QRO.7.76.6.1905222223380.46@tvgsbejvaqbjf.bet>
Hi Junio & Ævar,
On Wed, 22 May 2019, Johannes Schindelin wrote:
Show 36 quoted lines
> On Fri, 17 May 2019, Ævar Arnfjörð Bjarmason wrote: > > > [...] > > +test_expect_success $PREREQ 'sendemail.identity: bool variable fallback' ' > > + git -c sendemail.identity=cloud \ > > + -c sendemail.xmailer=false \ > > + send-email \ > > + --dry-run \ > > + --from="nobody@example.com" \ > > + $patches >stdout && > > + grep "To: cloud@example.com" stdout && > > + ! grep "X-Mailer" stdout > > +' > > + > > These test cases all diligently use the `$PREREQ` prerequisite, but... > > > test_expect_success $PREREQ '--no-to overrides sendemail.to' ' > > git send-email \ > > --dry-run \ > > @@ -1785,6 +1840,15 @@ test_expect_success '--dump-aliases must be used alone' ' > > test_must_fail git send-email --dump-aliases --to=janice@example.com -1 refs/heads/accounting > > ' > > > > +test_expect_success 'aliases and sendemail.identity' ' > > + test_must_fail git \ > > + -c sendemail.identity=cloud \ > > + -c sendemail.aliasesfile=default-aliases \ > > + -c sendemail.cloud.aliasesfile=cloud-aliases \ > > + send-email -1 2>stderr && > > + test_i18ngrep "cloud-aliases" stderr > > +' > > + > > This one is missing it. That breaks the Windows job in our Azure Pipeline > where we leave out all of the Perl bits (to accelerate the tests somewhat).
For the record, this is still breaking our Azure Pipeline build.
Junio, would you terribly mind applying this on top (or fetching it from the `shears/pu` branch at https://github.com/git-for-windows/git)?
-- snipsnap -- From 4c946f956d894676f68f5b130ab414d8ea75e97d Mon Sep 17 00:00:00 2001 From: Johannes Schindelin <johannes.schindelin@gmx.de> Date: Wed, 29 May 2019 11:09:23 +0200 Subject: [PATCH] SQUASH???
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> --- t/t9001-send-email.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 7caab8160fcf..7c5ef114ac90 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1840,7 +1840,7 @@ test_expect_success '--dump-aliases must be used alone' ' test_must_fail git send-email --dump-aliases --to=janice@example.com -1 refs/heads/accounting ' -test_expect_success 'aliases and sendemail.identity' ' +test_expect_success $PREREQ 'aliases and sendemail.identity' ' test_must_fail git \ -c sendemail.identity=cloud \ -c sendemail.aliasesfile=default-aliases \ -- 2.22.0.rc1.windows.1.19.g571a93d65ff3