From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Aaron Lindsay <aaron@aclindsay.com>
Cc: git@vger.kernel.org, Paolo Bonzini <pbonzini@redhat.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] send-email: Avoid empty transfer encoding header
Date: Fri, 2 Nov 2018 01:53:35 +0000 [thread overview]
Message-ID: <20181102015335.GC731755@genre.crustytoothpaste.net> (raw)
In-Reply-To: <20181102010934.15473-1-aaron@aclindsay.com>
[-- Attachment #1: Type: text/plain, Size: 2325 bytes --]
On Thu, Nov 01, 2018 at 09:09:34PM -0400, Aaron Lindsay wrote:
> Fix a small bug introduced by "7a36987ff (send-email: add an auto option
> for transfer encoding, 2018-07-14)
>
> I saw the following message when setting --transfer-encoding for a file
> with the same encoding:
> $ git send-email --transfer-encoding=8bit example.patch
> Use of uninitialized value $xfer_encoding in concatenation (.) or string
> at /usr/lib/git-core/git-send-email line 1744.
>
> Signed-off-by: Aaron Lindsay <aaron@aclindsay.com>
> ---
> git-send-email.perl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-send-email.perl b/git-send-email.perl
> index 2be5dac33..39c15bcc8 100755
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -1834,7 +1834,7 @@ sub apply_transfer_encoding {
> my $from = shift;
> my $to = shift;
>
> - return $message if ($from eq $to and $from ne '7bit');
> + return ($message, $to) if ($from eq $to and $from ne '7bit');
Thanks, this is obviously correct.
Would you like to squash in the below patch to add a test?
----- >% -----
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "brian m. carlson" <sandals@crustytoothpaste.net>
Date: Fri, 2 Nov 2018 01:51:33 +0000
Subject: [PATCH] squash! send-email: Avoid empty transfer encoding header
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
t/t9001-send-email.sh | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 1ef1a19003..ee1efcc59d 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -492,6 +492,21 @@ do
--validate \
$patches longline.patch
'
+
+done
+
+for enc in 7bit 8bit quoted-printable base64
+do
+ test_expect_success $PREREQ "--transfer-encoding=$enc produces correct header" '
+ clean_fake_sendmail &&
+ git send-email \
+ --from="Example <nobody@example.com>" \
+ --to=nobody@example.com \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ --transfer-encoding=$enc \
+ $patches &&
+ grep "Content-Transfer-Encoding: $enc" msgtxt1
+ '
done
test_expect_success $PREREQ 'Invalid In-Reply-To' '
--
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 868 bytes --]
next prev parent reply other threads:[~2018-11-02 1:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-02 1:09 [PATCH] send-email: Avoid empty transfer encoding header Aaron Lindsay
2018-11-02 1:53 ` brian m. carlson [this message]
2018-11-02 9:52 ` [PATCH v2] " Aaron Lindsay
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=20181102015335.GC731755@genre.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=aaron@aclindsay.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pbonzini@redhat.com \
/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).