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

multimail: fix a few simple spelling errors 

Also submitted upstream as:
  https://github.com/git-multimail/git-multimail/pull/208

Reported-by: Jens Schleusener <Jens.Schleusener@fossies.org>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2019-11-05 17:07:29 +00:00 committed by Junio C Hamano
parent 557c5895c2
commit ae821ffe83
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/hooks/multimail/git_multimail.py
View File

@ -95,7 +95,7 @@ if PYTHON3:
unicode = str unicode = str


def write_str(f, msg): def write_str(f, msg):
# Try outputing with the default encoding. If it fails, # Try outputting with the default encoding. If it fails,
# try UTF-8. # try UTF-8.
try: try:
f.buffer.write(msg.encode(sys.getdefaultencoding())) f.buffer.write(msg.encode(sys.getdefaultencoding()))
@ -2129,7 +2129,7 @@ class SMTPMailer(Mailer):
# equivalent to # equivalent to
# self.smtp.ehlo() # self.smtp.ehlo()
# self.smtp.starttls() # self.smtp.starttls()
# with acces to the ssl layer # with access to the ssl layer
self.smtp.ehlo() self.smtp.ehlo()
if not self.smtp.has_extn("starttls"): if not self.smtp.has_extn("starttls"):
raise smtplib.SMTPException("STARTTLS extension not supported by server") raise smtplib.SMTPException("STARTTLS extension not supported by server")
@ -2148,7 +2148,7 @@ class SMTPMailer(Mailer):
cert_reqs=ssl.CERT_NONE cert_reqs=ssl.CERT_NONE
) )
self.environment.get_logger().error( self.environment.get_logger().error(
'*** Warning, the server certificat is not verified (smtp) ***\n' '*** Warning, the server certificate is not verified (smtp) ***\n'
'*** set the option smtpCACerts ***\n' '*** set the option smtpCACerts ***\n'
) )
if not hasattr(self.smtp.sock, "read"): if not hasattr(self.smtp.sock, "read"):
@ -3189,7 +3189,7 @@ class ProjectdescEnvironmentMixin(Environment):
self.COMPUTED_KEYS += ['projectdesc'] self.COMPUTED_KEYS += ['projectdesc']


def get_projectdesc(self): def get_projectdesc(self):
"""Return a one-line descripition of the project.""" """Return a one-line description of the project."""


git_dir = get_git_dir() git_dir = get_git_dir()
try: try:

2
contrib/hooks/multimail/post-receive.example
View File

@ -56,7 +56,7 @@ config = git_multimail.Config('multimailhook')


# Set some Git configuration variables. Equivalent to passing var=val # Set some Git configuration variables. Equivalent to passing var=val
# to "git -c var=val" each time git is called, or to adding the # to "git -c var=val" each time git is called, or to adding the
# configuration in .git/config (must come before instanciating the # configuration in .git/config (must come before instantiating the
# environment) : # environment) :
#git_multimail.Config.add_config_parameters('multimailhook.commitEmailFormat=html') #git_multimail.Config.add_config_parameters('multimailhook.commitEmailFormat=html')
#git_multimail.Config.add_config_parameters(('user.name=foo', 'user.email=foo@example.com')) #git_multimail.Config.add_config_parameters(('user.name=foo', 'user.email=foo@example.com'))