Merge branch 'mh/maint-notes-merge-pathbuf-fix'

diff --git a/git-send-email.perl b/git-send-email.perl
index 76565de2ee517f48001ffacca32e3c08320cfe38..734356a6fb3b22dceb4a1afe7751811628b60ce7 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -275,7 +275,9 @@ sub signal_handler {
 # Begin by accumulating all the variables (defined above), that we will end up
 # needing, first, from the command line:
 
-my $rc = GetOptions("sender|from=s" => \$sender,
+my $help;
+my $rc = GetOptions("h" => \$help,
+                   "sender|from=s" => \$sender,
                     "in-reply-to=s" => \$initial_reply_to,
                    "subject=s" => \$initial_subject,
                    "to=s" => \@initial_to,
@@ -313,6 +315,7 @@ sub signal_handler {
                    "force" => \$force,
         );
 
+usage() if $help;
 unless ($rc) {
     usage();
 }
@@ -1091,7 +1094,7 @@ sub send_message {
                            "VALUES: server=$smtp_server ",
                            "encryption=$smtp_encryption ",
                            "hello=$smtp_domain",
-                           defined $smtp_server_port ? "port=$smtp_server_port" : "";
+                           defined $smtp_server_port ? " port=$smtp_server_port" : "";
                }
 
                if (defined $smtp_authuser) {