From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Feb 2010 23:09:19 +0000 (-0800)
Subject: Merge branch 'jc/maint-imap-config-parse' into maint
X-Git-Tag: v1.6.6.2~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/0c15da68e819183fcf85f45daa25965b6fde86cc?hp=35da43e9bb4a5d7542c2ee27e0a3557ac921e3ab

Merge branch 'jc/maint-imap-config-parse' into maint

* jc/maint-imap-config-parse:
Fix parsing of imap.preformattedHTML and imap.sslverify
---

diff --git a/imap-send.c b/imap-send.c
index de8114bac0..ea769a960a 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -1335,11 +1335,16 @@ static int git_imap_config(const char *key, const char *val, void *cb)
 	if (strncmp(key, imap_key, sizeof imap_key - 1))
 		return 0;
 
-	if (!val)
-		return config_error_nonbool(key);
-
 	key += sizeof imap_key - 1;
 
+	/* check booleans first, and barf on others */
+	if (!strcmp("sslverify", key))
+		server.ssl_verify = git_config_bool(key, val);
+	else if (!strcmp("preformattedhtml", key))
+		server.use_html = git_config_bool(key, val);
+	else if (!val)
+		return config_error_nonbool(key);
+
 	if (!strcmp("folder", key)) {
 		imap_folder = xstrdup(val);
 	} else if (!strcmp("host", key)) {
@@ -1360,10 +1365,6 @@ static int git_imap_config(const char *key, const char *val, void *cb)
 		server.port = git_config_int(key, val);
 	else if (!strcmp("tunnel", key))
 		server.tunnel = xstrdup(val);
-	else if (!strcmp("sslverify", key))
-		server.ssl_verify = git_config_bool(key, val);
-	else if (!strcmp("preformattedHTML", key))
-		server.use_html = git_config_bool(key, val);
 	return 0;
 }