From: Michael Strawbridge <michael.strawbridge@amd•com>
To: Jeff King <peff@peff•net>, Junio C Hamano <gitster@pobox•com>
Cc: Bagas Sanjaya <bagasdotme@gmail•com>,
Git Mailing List <git@vger•kernel.org>
Subject: [PATCH] send-email: move validation code below process_address_list
Date: Tue, 24 Oct 2023 16:19:43 -0400 [thread overview]
Message-ID: <ee56c4df-e030-45f9-86a9-94fb3540db60@amd.com> (raw)
In-Reply-To: <393f598e-c7cd-4dc6-a221-9aed7ffcc2b1@amd.com>
From 09ea51d63cebdf9ff0c073ef86e21b4b09c268e5 Mon Sep 17 00:00:00 2001
From: Michael Strawbridge <michael.strawbridge@amd•com>
Date: Wed, 11 Oct 2023 16:13:13 -0400
Subject: [PATCH] send-email: move validation code below process_address_list
Move validation logic below processing of email address lists so that
email validation gets the proper email addresses.
This fixes email address validation errors when the optional
perl module Email::Valid is installed and multiple addresses are passed
in on a single to/cc argument like --to=foo@example.com,bar@example•com.
Reported-by: Bagas Sanjaya <bagasdotme@gmail•com>
Signed-off-by: Michael Strawbridge <michael.strawbridge@amd•com>
---
git-send-email.perl | 48 ++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/git-send-email.perl b/git-send-email.perl
index 288ea1ae80..a898dbc76e 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -799,30 +799,6 @@ sub is_format_patch_arg {
$time = time - scalar $#files;
-if ($validate) {
- # FIFOs can only be read once, exclude them from validation.
- my @real_files = ();
- foreach my $f (@files) {
- unless (-p $f) {
- push(@real_files, $f);
- }
- }
-
- # Run the loop once again to avoid gaps in the counter due to FIFO
- # arguments provided by the user.
- my $num = 1;
- my $num_files = scalar @real_files;
- $ENV{GIT_SENDEMAIL_FILE_TOTAL} = "$num_files";
- foreach my $r (@real_files) {
- $ENV{GIT_SENDEMAIL_FILE_COUNTER} = "$num";
- pre_process_file($r, 1);
- validate_patch($r, $target_xfer_encoding);
- $num += 1;
- }
- delete $ENV{GIT_SENDEMAIL_FILE_COUNTER};
- delete $ENV{GIT_SENDEMAIL_FILE_TOTAL};
-}
-
@files = handle_backup_files(@files);
if (@files) {
@@ -2023,6 +1999,30 @@ sub process_file {
return 1;
}
+if ($validate) {
+ # FIFOs can only be read once, exclude them from validation.
+ my @real_files = ();
+ foreach my $f (@files) {
+ unless (-p $f) {
+ push(@real_files, $f);
+ }
+ }
+
+ # Run the loop once again to avoid gaps in the counter due to FIFO
+ # arguments provided by the user.
+ my $num = 1;
+ my $num_files = scalar @real_files;
+ $ENV{GIT_SENDEMAIL_FILE_TOTAL} = "$num_files";
+ foreach my $r (@real_files) {
+ $ENV{GIT_SENDEMAIL_FILE_COUNTER} = "$num";
+ pre_process_file($r, 1);
+ validate_patch($r, $target_xfer_encoding);
+ $num += 1;
+ }
+ delete $ENV{GIT_SENDEMAIL_FILE_COUNTER};
+ delete $ENV{GIT_SENDEMAIL_FILE_TOTAL};
+}
+
foreach my $t (@files) {
while (!process_file($t)) {
# user edited the file
--
2.42.0
next prev parent reply other threads:[~2023-10-24 20:19 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-22 9:27 [REGRESSION] uninitialized value $address in git send-email when given multiple recipients separated by commas Bagas Sanjaya
2023-09-24 3:36 ` Jeff King
2023-09-25 7:45 ` Bagas Sanjaya
2023-09-25 8:00 ` Jeff King
2023-09-25 14:48 ` Todd Zullinger
2023-09-25 16:17 ` Jeff King
2023-10-11 13:41 ` Bagas Sanjaya
2023-10-11 19:27 ` Michael Strawbridge
2023-10-11 20:22 ` [PATCH] send-email: move process_address_list earlier to avoid, uninitialized address error Michael Strawbridge
2023-10-11 20:25 ` Michael Strawbridge
2023-10-11 21:27 ` Junio C Hamano
2023-10-11 22:18 ` Jeff King
2023-10-11 22:37 ` Junio C Hamano
2023-10-11 22:47 ` Jeff King
2023-10-13 20:25 ` Michael Strawbridge
2023-10-20 6:45 ` Jeff King
2023-10-20 7:14 ` Jeff King
2023-10-20 10:03 ` [PATCH 0/3] some send-email --compose fixes Jeff King
2023-10-20 10:09 ` [PATCH 1/3] doc/send-email: mention handling of "reply-to" with --compose Jeff King
2023-10-20 10:13 ` [PATCH 2/3] Revert "send-email: extract email-parsing code into a subroutine" Jeff King
2023-10-20 10:45 ` Oswald Buddenhagen
2023-10-23 18:40 ` Jeff King
2023-10-23 19:50 ` Oswald Buddenhagen
2023-10-25 6:11 ` Jeff King
2023-10-25 9:23 ` Oswald Buddenhagen
2023-10-27 22:31 ` Junio C Hamano
2023-10-30 9:13 ` Jeff King
2023-10-20 21:45 ` Junio C Hamano
2023-10-23 18:47 ` Jeff King
2023-10-20 10:15 ` [PATCH 3/3] send-email: handle to/cc/bcc from --compose message Jeff King
2023-10-20 17:30 ` Eric Sunshine
2023-10-20 21:42 ` [PATCH 0/3] some send-email --compose fixes Junio C Hamano
2023-10-23 18:51 ` Jeff King
2023-10-24 20:12 ` Michael Strawbridge
2023-10-24 20:19 ` Michael Strawbridge [this message]
2023-10-24 21:55 ` [PATCH] send-email: move validation code below process_address_list Junio C Hamano
2023-10-24 22:03 ` Junio C Hamano
2023-10-25 18:48 ` Michael Strawbridge
2023-10-25 18:51 ` [PATCH v2] " Michael Strawbridge
2023-10-26 12:44 ` Junio C Hamano
2023-10-26 13:11 ` Michael Strawbridge
2023-10-25 6:50 ` [PATCH] " Jeff King
2023-10-25 18:47 ` Michael Strawbridge
2023-10-25 7:43 ` Uwe Kleine-König
2023-10-27 13:04 ` Junio C Hamano
2023-10-20 2:50 ` [PATCH] send-email: move process_address_list earlier to avoid, uninitialized address error Bagas Sanjaya
2023-09-26 11:33 ` [REGRESSION] uninitialized value $address in git send-email when given multiple recipients separated by commas Bagas Sanjaya
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=ee56c4df-e030-45f9-86a9-94fb3540db60@amd.com \
--to=michael.strawbridge@amd$(echo .)com \
--cc=bagasdotme@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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