Merge branch 'bn/send-email-smtp-auth-error-message-fix'

gitster · gitster · commit b6bd2d09646f · 2015-09-21T12:27:15.000-07:00
Fix a minor regression brought in to "git send-email" by a recent
addition of the "--smtp-auth" option.

* bn/send-email-smtp-auth-error-message-fix:
  send-email: fix uninitialized var warning for $smtp_auth
diff --git a/git-send-email.perl b/git-send-email.perl
@@ -1136,7 +1136,7 @@ sub smtp_auth_maybe {
 
 	# Check mechanism naming as defined in:
 	# https://tools.ietf.org/html/rfc4422#page-8
-	if ($smtp_auth !~ /^(\b[A-Z0-9-_]{1,20}\s*)*$/) {
+	if ($smtp_auth && $smtp_auth !~ /^(\b[A-Z0-9-_]{1,20}\s*)*$/) {
 		die "invalid smtp auth: '${smtp_auth}'";
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -1136,7 +1136,7 @@ sub smtp_auth_maybe {`
`1136`	`1136`
`1137`	`1137`	`# Check mechanism naming as defined in:`
`1138`	`1138`	`# https://tools.ietf.org/html/rfc4422#page-8`
`1139`		`- if ($smtp_auth !~ /^(\b[A-Z0-9-_]{1,20}\s)$/) {`
	`1139`	`+ if ($smtp_auth && $smtp_auth !~ /^(\b[A-Z0-9-_]{1,20}\s)$/) {`
`1140`	`1140`	`die "invalid smtp auth: '${smtp_auth}'";`
`1141`	`1141`	`}`
`1142`	`1142`