mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-28 20:44:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  send-email: only 'require' instead of 'use' Net::SMTP
  Allow multiple -m options to git-commit.
This commit is contained in:
Junio C Hamano 2006-05-31 18:24:45 -07:00
commit 5f625247ee
2 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
git-commit.sh
View File

@ -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

2
git-send-email.perl
View File

@ -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;