summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorLibravatar Yakov Lerner <iler.ml@gmail.com>2009-09-25 15:10:21 -0700
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2009-09-25 15:10:59 -0700
commitfb3650ed100a549f80d822f28ccf0f82e9f75f3e (patch)
tree780f6206f5aeaa9edc625d6857488d038829c73e /Documentation/merge-strategies.txt
parentbash: teach 'git checkout' options (diff)
downloadtgif-fb3650ed100a549f80d822f28ccf0f82e9f75f3e.tar.xz
send-email: fix obscure error when encryption=tls and smtp cannot connect
When encryption=tls and we cannot connect to the SMTP server, git-send-email was printing an obtuse perl error: Can't call method "command" on an undefined value at git-send-email line 927. This can occur when smtp host or port is misspelled, or the network is down, and encryption has been set to tls. Instead we expect some familiar "Cannot connect to SERVER:PORT" message. Fix it to print normal "smtp can't connect" diagnostics. Signed-off-by: Yakov Lerner <iler.ml@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions