aboutsummaryrefslogtreecommitdiffstats
path: root/git-send-email.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-07-14 11:19:25 -0700
committerJunio C Hamano <gitster@pobox.com>2025-07-14 11:19:25 -0700
commitdb4a912c4ab822d494ba0a1695d6a0e731dde0ca (patch)
tree140ea5d798669bfa777f07f4506f60ba1dcb75ab /git-send-email.perl
parentMerge branch 'jc/coccicheck-fails-make-when-it-fails' (diff)
parentcontrib: better support symbolic port names in git-credential-netrc (diff)
downloadgit-db4a912c4ab822d494ba0a1695d6a0e731dde0ca.tar.gz
git-db4a912c4ab822d494ba0a1695d6a0e731dde0ca.zip
Merge branch 'mc/netrc-service-names'
"netrc" credential helper has been improved to understand textual service names (like smtp) in addition to the numeric port numbers (like 25). * mc/netrc-service-names: contrib: better support symbolic port names in git-credential-netrc contrib: warn for invalid netrc file ports in git-credential-netrc contrib: use a more portable shebang for git-credential-netrc
Diffstat (limited to 'git-send-email.perl')
-rwxr-xr-xgit-send-email.perl11
1 files changed, 11 insertions, 0 deletions
diff --git a/git-send-email.perl b/git-send-email.perl
index cb6dca2500..437f8ac46a 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -2112,6 +2112,17 @@ if ($validate) {
}
}
+ # Validate the SMTP server port, if provided.
+ if (defined $smtp_server_port) {
+ my $port = Git::port_num($smtp_server_port);
+ if ($port) {
+ $smtp_server_port = $port;
+ } else {
+ die sprintf(__("error: invalid SMTP port '%s'\n"),
+ $smtp_server_port);
+ }
+ }
+
# Run the loop once again to avoid gaps in the counter due to FIFO
# arguments provided by the user.
my $num = 1;