summaryrefslogtreecommitdiff
path: root/imap-send.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-04-22 10:41:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-23 04:42:23 (GMT)
commit34b5cd1fe9f9130b747388a1a968a8d4c9906865 (patch)
treef1538c8693c606f3374788542cde4b485a72fc43 /imap-send.c
parent2498a1ad0b0fc06f1fd40074b9bb55eb3d7ae094 (diff)
downloadgit-34b5cd1fe9f9130b747388a1a968a8d4c9906865.zip
git-34b5cd1fe9f9130b747388a1a968a8d4c9906865.tar.gz
git-34b5cd1fe9f9130b747388a1a968a8d4c9906865.tar.bz2
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 <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'imap-send.c')
-rw-r--r--imap-send.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/imap-send.c b/imap-send.c
index 04afbc4..db65597 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 */