With --validate (which is the default), we warn about lines exceeding 998 characters due to the limits specified in RFC 5321. However, if we're using a suitable transfer encoding (quoted-printable or base64), we're guaranteed not to have lines exceeding 76 characters, so there's no need to fail in this case. The auto transfer encoding handles this specific case, so accept it as well. Signed-off-by: brian m. carlson <sandals@xxxxxxxxxxxxxxxxxxxx> --- Documentation/git-send-email.txt | 5 +++-- git-send-email.perl | 8 ++++++-- t/t9001-send-email.sh | 13 +++++++++++++ 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index 385c7de9e2..f44fb4b81e 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -401,8 +401,9 @@ have been specified, in which case default to 'compose'. + -- * Invoke the sendemail-validate hook if present (see linkgit:githooks[5]). - * Warn of patches that contain lines longer than 998 characters; this - is due to SMTP limits as described by http://www.ietf.org/rfc/rfc2821.txt. + * Warn of patches that contain lines longer than 998 characters unless + a suitable transfer encoding is used; this is due to SMTP limits as + described by http://www.ietf.org/rfc/rfc2821.txt. -- + Default is the value of `sendemail.validate`; if this is not set, diff --git a/git-send-email.perl b/git-send-email.perl index a76953c310..4ea30c4070 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -645,7 +645,7 @@ sub is_format_patch_arg { if ($validate) { foreach my $f (@files) { unless (-p $f) { - my $error = validate_patch($f); + my $error = validate_patch($f, $target_xfer_encoding); $error and die sprintf(__("fatal: %s: %s\nwarning: no patches were sent\n"), $f, $error); } @@ -1879,7 +1879,7 @@ sub unique_email_list { } sub validate_patch { - my $fn = shift; + my ($fn, $xfer_encoding) = @_; if ($repo) { my $validate_hook = catfile(catdir($repo->repo_path(), 'hooks'), @@ -1899,6 +1899,10 @@ sub validate_patch { return $hook_error if $hook_error; } + # Any long lines will be automatically fixed if we use a suitable transfer + # encoding. + return if $xfer_encoding =~ /^(?:auto|quoted-printable|base64)$/; + open(my $fh, '<', $fn) or die sprintf(__("unable to open %s: %s\n"), $fn, $!); while (my $line = <$fh>) { diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 6cdcbcb19e..6a0ace386b 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -480,6 +480,19 @@ test_expect_success $PREREQ 'long lines with auto encoding are quoted-printable' grep "Content-Transfer-Encoding: quoted-printable" msgtxt1 ' +test_expect_success $PREREQ '--validate passes with certain encodings' ' + for enc in auto quoted-printable base64 + do + git send-email \ + --from="Example <nobody@xxxxxxxxxxx>" \ + --to=nobody@xxxxxxxxxxx \ + --smtp-server="$(pwd)/fake.sendmail" \ + --transfer-encoding=$enc \ + --validate \ + $patches longline.patch + done +' + test_expect_success $PREREQ 'Invalid In-Reply-To' ' clean_fake_sendmail && git send-email \
