diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-01 05:24:45 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-01 05:24:45 +0400 |
commit | 5f625247ee64276a5ea51359c685be7ddefcfc59 (patch) | |
tree | 21e3269177b075a85e5b8be7f141abb98ce1d6b1 | |
parent | 5ff6a3269085c5cd425bad9f470d421a8d62f338 (diff) | |
parent | 87840620fd77e39a0df91dc8b8db6cfdb5e4845a (diff) |
Merge branch 'master' into next
* master:
send-email: only 'require' instead of 'use' Net::SMTP
Allow multiple -m options to git-commit.
-rwxr-xr-x | git-commit.sh | 37 | ||||
-rwxr-xr-x | git-send-email.perl | 2 |
2 files changed, 31 insertions, 8 deletions
diff --git a/git-commit.sh b/git-commit.sh index 91f28f9a23..6dd04fd367 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -260,20 +260,41 @@ do -m|--m|--me|--mes|--mess|--messa|--messag|--message) case "$#" in 1) usage ;; esac shift - log_given=t$log_given - log_message="$1" + log_given=m$log_given + if test "$log_message" = '' + then + log_message="$1" + else + log_message="$log_message + +$1" + fi no_edit=t shift ;; -m*) - log_given=t$log_given - log_message=`expr "$1" : '-m\(.*\)'` + log_given=m$log_given + if test "$log_message" = '' + then + log_message=`expr "$1" : '-m\(.*\)'` + else + log_message="$log_message + +`expr "$1" : '-m\(.*\)'`" + fi no_edit=t shift ;; --m=*|--me=*|--mes=*|--mess=*|--messa=*|--messag=*|--message=*) - log_given=t$log_given - log_message=`expr "$1" : '-[^=]*=\(.*\)'` + log_given=m$log_given + if test "$log_message" = '' + then + log_message=`expr "$1" : '-[^=]*=\(.*\)'` + else + log_message="$log_message + +`expr "$1" : '-[^=]*=\(.*\)'`" + fi no_edit=t shift ;; @@ -378,7 +399,9 @@ esac case "$log_given" in tt*) - die "Only one of -c/-C/-F/-m can be used." ;; + die "Only one of -c/-C/-F can be used." ;; +*tm*|*mt*) + die "Option -m cannot be combined with -c/-C/-F." ;; esac case "$#,$also,$only,$amend" in diff --git a/git-send-email.perl b/git-send-email.perl index 0e368fff0c..ed1d89b3f7 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -21,7 +21,6 @@ use warnings; use Term::ReadLine; use Getopt::Long; use Data::Dumper; -use Net::SMTP; # most mail servers generate the Date: header, but not all... $ENV{LC_ALL} = 'C'; @@ -394,6 +393,7 @@ X-Mailer: git-send-email $gitversion print $sm "$header\n$message"; close $sm or die $?; } else { + require Net::SMTP; $smtp ||= Net::SMTP->new( $smtp_server ); $smtp->mail( $from ) or die $smtp->message; $smtp->to( @recipients ) or die $smtp->message; |