From 34b5cd1fe9f9130b747388a1a968a8d4c9906865 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Tue, 22 Apr 2008 06:41:47 -0400 Subject: Don't force imap.host to be set when imap.tunnel is set The documentation for git-imap-send suggests a tunnel setting such as Tunnel = "ssh -q user@server.com /usr/bin/imapd ./Maildir 2> /dev/null" which works wonderfully and doesn't require a username, password or port setting. However, git-imap-send currently requires that the imap.host variable be set in the config even when it was unused. This patch changes imap-send to only require that the imap.host setting is set if imap.tunnel is not set. Otherwise, server.host is set to "tunnel" for reporting purposes. Acked-by: Andy Parkins Signed-off-by: Junio C Hamano --- imap-send.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'imap-send.c') diff --git a/imap-send.c b/imap-send.c index 04afbc492..db6559725 100644 --- a/imap-send.c +++ b/imap-send.c @@ -1303,8 +1303,11 @@ main(int argc, char **argv) return 1; } if (!server.host) { - fprintf( stderr, "no imap host specified\n" ); - return 1; + if (!server.tunnel) { + fprintf( stderr, "no imap host specified\n" ); + return 1; + } + server.host = "tunnel"; } /* read the messages */ -- cgit v1.2.1