[PATCH 0/2] git-send-email: add --transfer-encoding option for conversion to specified encoding

classic Classic list List threaded Threaded
5 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 0/2] git-send-email: add --transfer-encoding option for conversion to specified encoding

Paolo Bonzini-2
From: Paolo Bonzini <[hidden email]>

The thread at http://thread.gmane.org/gmane.comp.version-control.git/257392
details problems when applying patches with "git am" in a repository with
CRLF line endings.  In the example in the thread, the repository originated
from "git-svn" so it is not possible to use core.eol and friends on it.

Right now, the best option is to use "git am --keep-cr".  However, when
a patch create new files, the patch application process will reject the
new file because it finds a "/dev/null\r" string instead of "/dev/null".

The problem is that SMTP transport is CRLF-unsafe; "git am --keep-cr" is
mostly working by chance and it would be very problematic to have a "git
am" workflow in a repository with mixed LF and CRLF line endings.  It is
more robust to forgo readable patch files[1] and use the quoted-printable
transfer enconding.  This series adds an option and configuration key
to git-send-email that lets it automatically produce quoted-printable
or base64 messages.

Paolo

[1] A useful oneliner to decode quoted-printable files is the following:
    perl -pe 'use MIME::QuotedPrint; $_=MIME::QuotedPrint::decode($_);'

Paolo Bonzini (2):
  git-send-email: delay creation of MIME headers
  git-send-email: add --transfer-encoding option

 Documentation/config.txt               |   1 +
 Documentation/git-send-email.txt       |  10 +++
 contrib/completion/git-completion.bash |   4 +
 git-send-email.perl                    |  61 +++++++++++--
 t/t9001-send-email.sh                  | 157 +++++++++++++++++++++++++++++++++
 5 files changed, 227 insertions(+), 6 deletions(-)

--
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2] git-send-email: delay creation of MIME headers

Paolo Bonzini-2
From: Paolo Bonzini <[hidden email]>

After the next patch, git-send-email will sometimes modify
existing Content-Transfer-Encoding headers.  Delay the addition
of the header to @xh until just before sending.  Do the same
for MIME-Version, to avoid adding it twice.

Signed-off-by: Paolo Bonzini <[hidden email]>
---
 git-send-email.perl | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/git-send-email.perl b/git-send-email.perl
index 9949db0..b29a304 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -1324,6 +1324,8 @@ foreach my $t (@files) {
  my $author_encoding;
  my $has_content_type;
  my $body_encoding;
+ my $xfer_encoding;
+ my $has_mime_version;
  @to = ();
  @cc = ();
  @xh = ();
@@ -1394,9 +1396,16 @@ foreach my $t (@files) {
  }
  push @xh, $_;
  }
+ elsif (/^MIME-Version/i) {
+ $has_mime_version = 1;
+ push @xh, $_;
+ }
  elsif (/^Message-Id: (.*)/i) {
  $message_id = $1;
  }
+ elsif (/^Content-Transfer-Encoding: (.*)/i) {
+ $xfer_encoding = $1 if not defined $xfer_encoding;
+ }
  elsif (!/^Date:\s/i && /^[-A-Za-z]+:\s+\S/) {
  push @xh, $_;
  }
@@ -1444,10 +1453,9 @@ foreach my $t (@files) {
  if defined $cc_cmd && !$suppress_cc{'cccmd'};
 
  if ($broken_encoding{$t} && !$has_content_type) {
+ $xfer_encoding = '8bit' if not defined $xfer_encoding;
  $has_content_type = 1;
- push @xh, "MIME-Version: 1.0",
- "Content-Type: text/plain; charset=$auto_8bit_encoding",
- "Content-Transfer-Encoding: 8bit";
+ push @xh, "Content-Type: text/plain; charset=$auto_8bit_encoding";
  $body_encoding = $auto_8bit_encoding;
  }
 
@@ -1467,14 +1475,19 @@ foreach my $t (@files) {
  }
  }
  else {
+ $xfer_encoding = '8bit' if not defined $xfer_encoding;
  $has_content_type = 1;
  push @xh,
-  'MIME-Version: 1.0',
-  "Content-Type: text/plain; charset=$author_encoding",
-  'Content-Transfer-Encoding: 8bit';
+  "Content-Type: text/plain; charset=$author_encoding";
  }
  }
  }
+ if (defined $xfer_encoding) {
+ push @xh, "Content-Transfer-Encoding: $xfer_encoding";
+ }
+ if (defined $xfer_encoding or $has_content_type) {
+ unshift @xh, 'MIME-Version: 1.0' unless $has_mime_version;
+ }
 
  $needs_confirm = (
  $confirm eq "always" or
--
2.1.0


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2] git-send-email: add --transfer-encoding option

Paolo Bonzini-2
In reply to this post by Paolo Bonzini-2
From: Paolo Bonzini <[hidden email]>

The thread at http://thread.gmane.org/gmane.comp.version-control.git/257392
details problems when applying patches with "git am" in a repository with
CRLF line endings.  In the example in the thread, the repository originated
from "git-svn" so it is not possible to use core.eol and friends on it.

Right now, the best option is to use "git am --keep-cr".  However, when
a patch create new files, the patch application process will reject the
new file because it finds a "/dev/null\r" string instead of "/dev/null".

The problem is that SMTP transport is CRLF-unsafe.  Sending a patch by
email is the same as passing it through "dos2unix | unix2dos".  The newly
introduced CRLFs are normally transparent because git-am strips them. The
keepcr=true setting preserves them, but it is mostly working by chance
and it would be very problematic to have a "git am" workflow in a
repository with mixed LF and CRLF line endings.

The MIME solution to this is the quoted-printable transfer enconding.
This is not something that we want to enable by default, since it makes
received emails horrible to look at.  However, it is a very good match
for projects that store CRLF line endings in the repository.

The only disadvantage of quoted-printable is that quoted-printable
patches fail to apply if the maintainer uses "git am --keep-cr".  This
is because the decoded patch will have two carriage returns at the end
of the line.  Therefore, add support for base64 transfer encoding too,
which makes received emails downright impossible to look at outside
a MUA, but really just works.

The patch covers all bases, including users that still live in the late
80s, by also providing a 7bit content transfer encoding that refuses
to send emails with non-ASCII character in them.  And finally, "8bit"
will add a Content-Transfer-Encoding header but otherwise do nothing.

Signed-off-by: Paolo Bonzini <[hidden email]>
---
 Documentation/config.txt               |   1 +
 Documentation/git-send-email.txt       |  10 +++
 contrib/completion/git-completion.bash |   4 +
 git-send-email.perl                    |  36 ++++++++
 t/t9001-send-email.sh                  | 157 +++++++++++++++++++++++++++++++++
 5 files changed, 208 insertions(+)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9220725..cc2ff20 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2303,6 +2303,7 @@ sendemail.smtpserverport::
 sendemail.smtpserveroption::
 sendemail.smtpuser::
 sendemail.thread::
+sendemail.transferencoding::
 sendemail.validate::
  See linkgit:git-send-email[1] for description.
 
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index a60776e..a9efa5c 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -131,6 +131,16 @@ Note that no attempts whatsoever are made to validate the encoding.
  Specify encoding of compose message. Default is the value of the
  'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed.
 
+--transfer-encoding=(7bit|8bit|quoted-printable|base64)::
+ Specify the transfer encoding to be used to send the message over SMTP.
+ 7bit will fail upon encountering a non-ASCII message.  quoted-printable
+ can be useful when the repository contains files that contain carriage
+ returns, but makes the raw patch email file (as saved from a MUA) much
+ harder to inspect manually.  base64 is even more fool proof, but also
+ even more opaque.  Default is the value of the 'sendemail.transferEncoding'
+ configuration value; if that is unspecified, git will use 8bit and not
+ add a Content-Transfer-Encoding header.
+
 
 Sending
 ~~~~~~~
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2fece98..b154f70 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1875,6 +1875,10 @@ _git_config ()
  __gitcomp "$__git_send_email_suppresscc_options"
  return
  ;;
+ sendemail.transferencoding)
+ __gitcomp "7bit 8bit quoted-printable base64"
+ return
+ ;;
  --get|--get-all|--unset|--unset-all)
  __gitcomp_nl "$(__git_config_get_set_variables)"
  return
diff --git a/git-send-email.perl b/git-send-email.perl
index b29a304..82c6fea 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -58,6 +58,7 @@ git send-email [options] <file | directory | rev-list options >
     --compose                      * Open an editor for introduction.
     --compose-encoding      <str>  * Encoding to assume for introduction.
     --8bit-encoding         <str>  * Encoding to assume 8bit mails if undeclared
+    --transfer-encoding     <str>  * Transfer encoding to use (quoted-printable, 8bit, base64)
 
   Sending:
     --envelope-sender       <str>  * Email envelope sender.
@@ -206,6 +207,7 @@ my ($validate, $confirm);
 my (@suppress_cc);
 my ($auto_8bit_encoding);
 my ($compose_encoding);
+my ($target_xfer_encoding);
 
 my ($debug_net_smtp) = 0; # Net::SMTP, see send_message()
 
@@ -242,6 +244,7 @@ my %config_settings = (
     "from" => \$sender,
     "assume8bitencoding" => \$auto_8bit_encoding,
     "composeencoding" => \$compose_encoding,
+    "transferencoding" => \$target_xfer_encoding,
 );
 
 my %config_path_settings = (
@@ -314,6 +317,7 @@ my $rc = GetOptions("h" => \$help,
     "envelope-sender=s" => \$envelope_sender,
     "thread!" => \$thread,
     "validate!" => \$validate,
+    "transfer-encoding=s" => \$target_xfer_encoding,
     "format-patch!" => \$format_patch,
     "8bit-encoding=s" => \$auto_8bit_encoding,
     "compose-encoding=s" => \$compose_encoding,
@@ -1482,6 +1486,12 @@ foreach my $t (@files) {
  }
  }
  }
+ if (defined $target_xfer_encoding) {
+ $xfer_encoding = '8bit' if not defined $xfer_encoding;
+ $message = apply_transfer_encoding(
+ $message, $xfer_encoding, $target_xfer_encoding);
+ $xfer_encoding = $target_xfer_encoding;
+ }
  if (defined $xfer_encoding) {
  push @xh, "Content-Transfer-Encoding: $xfer_encoding";
  }
@@ -1556,6 +1566,32 @@ sub cleanup_compose_files {
 
 $smtp->quit if $smtp;
 
+sub apply_transfer_encoding {
+ my $message = shift;
+ my $from = shift;
+ my $to = shift;
+
+ return $message if ($from eq $to and $from ne '7bit');
+
+ require MIME::QuotedPrint;
+ require MIME::Base64;
+
+ $message = MIME::QuotedPrint::decode($message)
+ if ($from eq 'quoted-printable');
+ $message = MIME::Base64::decode($message)
+ if ($from eq 'base64');
+
+ die "cannot send message as 7bit"
+ if ($to eq '7bit' and $message =~ /[^[:ascii:]]/);
+ return $message
+ if ($to eq '7bit' or $to eq '8bit');
+ return MIME::QuotedPrint::encode($message, "\n", 0)
+ if ($to eq 'quoted-printable');
+ return MIME::Base64::encode($message, "\n")
+ if ($to eq 'base64');
+ die "invalid transfer encoding";
+}
+
 sub unique_email_list {
  my %seen;
  my @emails;
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 19a3ced..e5016f4 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1298,6 +1298,163 @@ test_expect_success $PREREQ '--8bit-encoding also treats subject' '
  test_cmp expected actual
 '
 
+test_expect_success $PREREQ 'setup expect' '
+cat >email-using-8bit <<EOF
+From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
+Message-Id: <[hidden email]>
+From: A U Thor <[hidden email]>
+Date: Sat, 12 Jun 2010 15:53:58 +0200
+Content-Type: text/plain; charset=UTF-8
+Subject: Nothing to see here.
+
+Dieser Betreff enthält auch einen Umlaut!
+EOF
+'
+
+test_expect_success $PREREQ 'sendemail.transferencoding=7bit fails on 8bit data' '
+ clean_fake_sendmail &&
+ git config sendemail.transferEncoding 7bit &&
+ test_must_fail git send-email \
+  --transfer-encoding=7bit \
+  --smtp-server="$(pwd)/fake.sendmail" \
+  email-using-8bit \
+  2>errors >out &&
+ grep "cannot send message as 7bit" errors &&
+ test -z "$(ls msgtxt*)"
+'
+
+test_expect_success $PREREQ '--transfer-encoding overrides sendemail.transferEncoding' '
+ clean_fake_sendmail &&
+ git config sendemail.transferEncoding 8bit
+ test_must_fail git send-email \
+  --transfer-encoding=7bit \
+  --smtp-server="$(pwd)/fake.sendmail" \
+  email-using-8bit \
+  2>errors >out &&
+ grep "cannot send message as 7bit" errors &&
+ test -z "$(ls msgtxt*)"
+'
+
+test_expect_success $PREREQ 'sendemail.transferencoding=8bit' '
+ clean_fake_sendmail &&
+ git send-email \
+  --transfer-encoding=8bit \
+  --smtp-server="$(pwd)/fake.sendmail" \
+  email-using-8bit \
+  2>errors >out &&
+ sed '1,/^$/d' msgtxt1 >actual &&
+ sed '1,/^$/d' email-using-8bit >expected &&
+ test_cmp expected actual
+'
+
+test_expect_success $PREREQ 'setup expect' '
+cat >expected <<EOF
+Dieser Betreff enth=C3=A4lt auch einen Umlaut!
+EOF
+'
+
+test_expect_success $PREREQ '8-bit and sendemail.transferencoding=quoted-printable' '
+ clean_fake_sendmail &&
+ git send-email \
+  --transfer-encoding=quoted-printable \
+  --smtp-server="$(pwd)/fake.sendmail" \
+  email-using-8bit \
+  2>errors >out &&
+ sed '1,/^$/d' msgtxt1 >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success $PREREQ 'setup expect' '
+cat >expected <<EOF
+RGllc2VyIEJldHJlZmYgZW50aMOkbHQgYXVjaCBlaW5lbiBVbWxhdXQhCg==
+EOF
+'
+
+test_expect_success $PREREQ '8-bit and sendemail.transferencoding=base64' '
+ clean_fake_sendmail &&
+ git send-email \
+  --transfer-encoding=base64 \
+  --smtp-server="$(pwd)/fake.sendmail" \
+  email-using-8bit \
+  2>errors >out &&
+ sed '1,/^$/d' msgtxt1 >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success $PREREQ 'setup expect' '
+cat >email-using-qp <<EOF
+From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
+Message-Id: <[hidden email]>
+From: A U Thor <[hidden email]>
+Date: Sat, 12 Jun 2010 15:53:58 +0200
+MIME-Version: 1.0
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain; charset=UTF-8
+Subject: Nothing to see here.
+
+Dieser Betreff enth=C3=A4lt auch einen Umlaut!
+EOF
+'
+
+test_expect_success $PREREQ 'convert from quoted-printable to base64' '
+ clean_fake_sendmail &&
+ git send-email \
+  --transfer-encoding=base64 \
+  --smtp-server="$(pwd)/fake.sendmail" \
+  email-using-qp \
+  2>errors >out &&
+ sed '1,/^$/d' msgtxt1 >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success $PREREQ 'setup expect' "
+tr -d '\\015' | tr '%' '\\015' > email-using-crlf <<EOF
+From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
+Message-Id: <[hidden email]>
+From: A U Thor <[hidden email]>
+Date: Sat, 12 Jun 2010 15:53:58 +0200
+Content-Type: text/plain; charset=UTF-8
+Subject: Nothing to see here.
+
+Look, I have a CRLF and an = sign!%
+EOF
+"
+
+test_expect_success $PREREQ 'setup expect' '
+cat >expected <<EOF
+Look, I have a CRLF and an =3D sign!=0D
+EOF
+'
+
+test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=quoted-printable' '
+ clean_fake_sendmail &&
+ git send-email \
+  --transfer-encoding=quoted-printable \
+  --smtp-server="$(pwd)/fake.sendmail" \
+  email-using-crlf \
+  2>errors >out &&
+ sed '1,/^$/d' msgtxt1 >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success $PREREQ 'setup expect' '
+cat >expected <<EOF
+TG9vaywgSSBoYXZlIGEgQ1JMRiBhbmQgYW4gPSBzaWduIQ0K
+EOF
+'
+
+test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=base64' '
+ clean_fake_sendmail &&
+ git send-email \
+  --transfer-encoding=base64 \
+  --smtp-server="$(pwd)/fake.sendmail" \
+  email-using-crlf \
+  2>errors >out &&
+ sed '1,/^$/d' msgtxt1 >actual &&
+ test_cmp expected actual
+'
+
+
 # Note that the patches in this test are deliberately out of order; we
 # want to make sure it works even if the cover-letter is not in the
 # first mail.
--
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 2/2] git-send-email: add --transfer-encoding option

Eric Sunshine
On Tue, Nov 25, 2014 at 9:00 AM, Paolo Bonzini <[hidden email]> wrote:

> From: Paolo Bonzini <[hidden email]>
>
> The thread at http://thread.gmane.org/gmane.comp.version-control.git/257392
> details problems when applying patches with "git am" in a repository with
> CRLF line endings.  In the example in the thread, the repository originated
> from "git-svn" so it is not possible to use core.eol and friends on it.
>
> Right now, the best option is to use "git am --keep-cr".  However, when
> a patch create new files, the patch application process will reject the
> new file because it finds a "/dev/null\r" string instead of "/dev/null".
>
> The problem is that SMTP transport is CRLF-unsafe.  Sending a patch by
> email is the same as passing it through "dos2unix | unix2dos".  The newly
> introduced CRLFs are normally transparent because git-am strips them. The
> keepcr=true setting preserves them, but it is mostly working by chance
> and it would be very problematic to have a "git am" workflow in a
> repository with mixed LF and CRLF line endings.
>
> The MIME solution to this is the quoted-printable transfer enconding.
> This is not something that we want to enable by default, since it makes
> received emails horrible to look at.  However, it is a very good match
> for projects that store CRLF line endings in the repository.
>
> The only disadvantage of quoted-printable is that quoted-printable
> patches fail to apply if the maintainer uses "git am --keep-cr".  This
> is because the decoded patch will have two carriage returns at the end
> of the line.  Therefore, add support for base64 transfer encoding too,
> which makes received emails downright impossible to look at outside
> a MUA, but really just works.
>
> The patch covers all bases, including users that still live in the late
> 80s, by also providing a 7bit content transfer encoding that refuses
> to send emails with non-ASCII character in them.  And finally, "8bit"
> will add a Content-Transfer-Encoding header but otherwise do nothing.
>
> Signed-off-by: Paolo Bonzini <[hidden email]>
> ---
> diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
> index 19a3ced..e5016f4 100755
> --- a/t/t9001-send-email.sh
> +++ b/t/t9001-send-email.sh
> @@ -1298,6 +1298,163 @@ test_expect_success $PREREQ '--8bit-encoding also treats subject' '
>         test_cmp expected actual
>  '
>
> +test_expect_success $PREREQ 'setup expect' '
> +cat >email-using-8bit <<EOF

The test title says "setup expect", but this is creating an 8-bit
email message for input to git-send-email rather than expected output.
Perhaps the test title should be adjusted.

> +From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
> +Message-Id: <[hidden email]>
> +From: A U Thor <[hidden email]>
> +Date: Sat, 12 Jun 2010 15:53:58 +0200
> +Content-Type: text/plain; charset=UTF-8
> +Subject: Nothing to see here.
> +
> +Dieser Betreff enthält auch einen Umlaut!
> +EOF
> +'
> +
> +test_expect_success $PREREQ 'sendemail.transferencoding=7bit fails on 8bit data' '
> +       clean_fake_sendmail &&
> +       git config sendemail.transferEncoding 7bit &&

test_config here and elsewhere perhaps?

> +       test_must_fail git send-email \
> +         --transfer-encoding=7bit \

Redundant 7bit request.

> +         --smtp-server="$(pwd)/fake.sendmail" \
> +         email-using-8bit \
> +         2>errors >out &&
> +       grep "cannot send message as 7bit" errors &&
> +       test -z "$(ls msgtxt*)"
> +'
> +
> +test_expect_success $PREREQ '--transfer-encoding overrides sendemail.transferEncoding' '
> +       clean_fake_sendmail &&
> +       git config sendemail.transferEncoding 8bit

Broken &&-chain.

> +       test_must_fail git send-email \
> +         --transfer-encoding=7bit \
> +         --smtp-server="$(pwd)/fake.sendmail" \
> +         email-using-8bit \
> +         2>errors >out &&
> +       grep "cannot send message as 7bit" errors &&
> +       test -z "$(ls msgtxt*)"
> +'
> +
> +test_expect_success $PREREQ 'sendemail.transferencoding=8bit' '
> +       clean_fake_sendmail &&
> +       git send-email \
> +         --transfer-encoding=8bit \
> +         --smtp-server="$(pwd)/fake.sendmail" \
> +         email-using-8bit \
> +         2>errors >out &&

Is it necessary here to capture stdout and stderr rather than allowing
them to be handled automatically by the testing framework? In the two
prior tests, you do consult 'error' so it makes send to capture it,
but this test does not, nor do any following tests which capture those
streams. (The same question applies to the capture of stdout in the
above two tests. Is it necessary?)

> +       sed '1,/^$/d' msgtxt1 >actual &&
> +       sed '1,/^$/d' email-using-8bit >expected &&
> +       test_cmp expected actual
> +'
> +
> +test_expect_success $PREREQ 'setup expect' '
> +cat >expected <<EOF
> +Dieser Betreff enth=C3=A4lt auch einen Umlaut!
> +EOF

This "expected" file is used only by the following test. It might be
clearer and more robust (in case someone inserts new tests in between
these) to create the "expected" file directly in the test which uses
it. The same comment applies to other "expected" files each used by
only a single test.

> +'
> +
> +test_expect_success $PREREQ '8-bit and sendemail.transferencoding=quoted-printable' '
> +       clean_fake_sendmail &&
> +       git send-email \
> +         --transfer-encoding=quoted-printable \
> +         --smtp-server="$(pwd)/fake.sendmail" \
> +         email-using-8bit \
> +         2>errors >out &&
> +       sed '1,/^$/d' msgtxt1 >actual &&
> +       test_cmp expected actual
> +'
> +
> +test_expect_success $PREREQ 'setup expect' '
> +cat >expected <<EOF
> +RGllc2VyIEJldHJlZmYgZW50aMOkbHQgYXVjaCBlaW5lbiBVbWxhdXQhCg==
> +EOF
> +'
> +
> +test_expect_success $PREREQ '8-bit and sendemail.transferencoding=base64' '
> +       clean_fake_sendmail &&
> +       git send-email \
> +         --transfer-encoding=base64 \
> +         --smtp-server="$(pwd)/fake.sendmail" \
> +         email-using-8bit \
> +         2>errors >out &&
> +       sed '1,/^$/d' msgtxt1 >actual &&
> +       test_cmp expected actual
> +'
> +
> +test_expect_success $PREREQ 'setup expect' '
> +cat >email-using-qp <<EOF

Test title says "setup expect" but it's really setting up a
quoted-printable email.

> +From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
> +Message-Id: <[hidden email]>
> +From: A U Thor <[hidden email]>
> +Date: Sat, 12 Jun 2010 15:53:58 +0200
> +MIME-Version: 1.0
> +Content-Transfer-Encoding: quoted-printable
> +Content-Type: text/plain; charset=UTF-8
> +Subject: Nothing to see here.
> +
> +Dieser Betreff enth=C3=A4lt auch einen Umlaut!
> +EOF
> +'
> +
> +test_expect_success $PREREQ 'convert from quoted-printable to base64' '
> +       clean_fake_sendmail &&
> +       git send-email \
> +         --transfer-encoding=base64 \
> +         --smtp-server="$(pwd)/fake.sendmail" \
> +         email-using-qp \
> +         2>errors >out &&
> +       sed '1,/^$/d' msgtxt1 >actual &&
> +       test_cmp expected actual
> +'
> +
> +test_expect_success $PREREQ 'setup expect' "
> +tr -d '\\015' | tr '%' '\\015' > email-using-crlf <<EOF

Ditto: Test title says "setup expect" but it's setting up a CRLF email.

> +From fe6ecc66ece37198fe5db91fa2fc41d9f4fe5cc4 Mon Sep 17 00:00:00 2001
> +Message-Id: <[hidden email]>
> +From: A U Thor <[hidden email]>
> +Date: Sat, 12 Jun 2010 15:53:58 +0200
> +Content-Type: text/plain; charset=UTF-8
> +Subject: Nothing to see here.
> +
> +Look, I have a CRLF and an = sign!%
> +EOF
> +"
> +
> +test_expect_success $PREREQ 'setup expect' '
> +cat >expected <<EOF
> +Look, I have a CRLF and an =3D sign!=0D
> +EOF
> +'
> +
> +test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=quoted-printable' '
> +       clean_fake_sendmail &&
> +       git send-email \
> +         --transfer-encoding=quoted-printable \
> +         --smtp-server="$(pwd)/fake.sendmail" \
> +         email-using-crlf \
> +         2>errors >out &&
> +       sed '1,/^$/d' msgtxt1 >actual &&
> +       test_cmp expected actual
> +'
> +
> +test_expect_success $PREREQ 'setup expect' '
> +cat >expected <<EOF
> +TG9vaywgSSBoYXZlIGEgQ1JMRiBhbmQgYW4gPSBzaWduIQ0K
> +EOF
> +'
> +
> +test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=base64' '
> +       clean_fake_sendmail &&
> +       git send-email \
> +         --transfer-encoding=base64 \
> +         --smtp-server="$(pwd)/fake.sendmail" \
> +         email-using-crlf \
> +         2>errors >out &&
> +       sed '1,/^$/d' msgtxt1 >actual &&
> +       test_cmp expected actual
> +'
> +
> +
>  # Note that the patches in this test are deliberately out of order; we
>  # want to make sure it works even if the cover-letter is not in the
>  # first mail.
> --
> 2.1.0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH 2/2] git-send-email: add --transfer-encoding option

Junio C Hamano
Eric Sunshine <[hidden email]> writes:

>> +test_expect_success $PREREQ 'sendemail.transferencoding=7bit fails on 8bit data' '
>> +       clean_fake_sendmail &&
>> +       git config sendemail.transferEncoding 7bit &&
>
> test_config here and elsewhere perhaps?
> ...
>
>> +       test_must_fail git send-email \
>> +         --transfer-encoding=7bit \
>
> Redundant 7bit request.
>
>> +         --smtp-server="$(pwd)/fake.sendmail" \
>> +         email-using-8bit \
>> +         2>errors >out &&
>> +       grep "cannot send message as 7bit" errors &&
>> +       test -z "$(ls msgtxt*)"
>> +'
>> +
>> +test_expect_success $PREREQ '--transfer-encoding overrides sendemail.transferEncoding' '
>> +       clean_fake_sendmail &&
>> +       git config sendemail.transferEncoding 8bit
>
> Broken &&-chain.

Thanks for a careful reading ;-).

The original before this patch is written in old 2005 style, which
makes it rather hard to read and add new tests to mimick the
existing tests.  Perhaps we would need to clean it up at some point,
probably after the dust settles after this series is done.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [hidden email]
More majordomo info at  http://vger.kernel.org/majordomo-info.html