mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'jc/maint-imap-config-parse' into maint
* jc/maint-imap-config-parse: Fix parsing of imap.preformattedHTML and imap.sslverify
This commit is contained in:
commit
0c15da68e8
15
imap-send.c
15
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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue