kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'ag/send-email-hostname-f' 

Teach "git send-email" to also consult `hostname -f` for mail
domain to compute the identity given to SMTP servers.

* ag/send-email-hostname-f:
  send-email: try to get fqdn by running hostname -f on Linux and macOS
maint
Junio C Hamano 2025-05-23 15:34:08 -07:00
parent 5e9dea5171 9c9f8849a2
commit fb67f789b0
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
git-send-email.perl
View File

@ -1393,8 +1393,22 @@ sub maildomain_mta {
return $maildomain;
}

sub maildomain_hostname_command {
my $maildomain;

if ($^O eq 'linux' || $^O eq 'darwin') {
my $domain = `(hostname -f) 2>/dev/null`;
if (!$?) {
chomp($domain);
$maildomain = $domain if valid_fqdn($domain);
}
}
return $maildomain;
}

sub maildomain {
return maildomain_net() || maildomain_mta() || 'localhost.localdomain';
return maildomain_net() || maildomain_mta() ||
maildomain_hostname_command || 'localhost.localdomain';
}

sub smtp_host_string {