From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Nov 2011 21:28:53 +0000 (-0800)
Subject: Merge branch 'maint' into tj/imap-send-remove-unused
X-Git-Tag: v1.7.8.2~21^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3686aa1caf907d22fe318c28efe93f0e7870ba50

Merge branch 'maint' into tj/imap-send-remove-unused

* maint: (18123 commits)
documentation fix: git difftool uses diff tools, not merge tools.
Git 1.7.7.4
Makefile: add missing header file dependencies
notes merge: eliminate OUTPUT macro
mailmap: xcalloc mailmap_info
name-rev --all: do not even attempt to describe non-commit object
Git 1.7.7.3
docs: Update install-doc-quick
docs: don't mention --quiet or --exit-code in git-log(1)
Git 1.7.7.2
t7511: avoid use of reserved filename on Windows.
clone: Quote user supplied path in a single quote pair
read-cache.c: fix index memory allocation
make the sample pre-commit hook script reject names with newlines, too
Reindent closing bracket using tab instead of spaces
Git 1.7.7.1
RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting
gitweb: fix regression when filtering out forks
Almost ready for 1.7.7.1
pack-objects: don't traverse objects unnecessarily
...

Conflicts:
imap-send.c
---

3686aa1caf907d22fe318c28efe93f0e7870ba50
diff --cc imap-send.c
index 57221e6bd1,e1ad1a48ce..80e0e8c051
--- a/imap-send.c
+++ b/imap-send.c
@@@ -123,28 -139,47 +139,46 @@@ struct imap_server_conf 
  	int port;
  	char *user;
  	char *pass;
- } imap_server_conf_t;
+ 	int use_ssl;
+ 	int ssl_verify;
+ 	int use_html;
+ 	char *auth_method;
+ };
+ 
+ static struct imap_server_conf server = {
+ 	NULL,	/* name */
+ 	NULL,	/* tunnel */
+ 	NULL,	/* host */
+ 	0,	/* port */
+ 	NULL,	/* user */
+ 	NULL,	/* pass */
+ 	0,   	/* use_ssl */
+ 	1,   	/* ssl_verify */
+ 	0,   	/* use_html */
+ 	NULL,	/* auth_method */
+ };
  
- typedef struct imap_store_conf {
- 	store_conf_t gen;
- 	imap_server_conf_t *server;
- } imap_store_conf_t;
+ struct imap_store_conf {
+ 	struct store_conf gen;
+ 	struct imap_server_conf *server;
 -	unsigned use_namespace:1;
+ };
  
- #define NIL	(void*)0x1
- #define LIST	(void*)0x2
+ #define NIL	(void *)0x1
+ #define LIST	(void *)0x2
  
- typedef struct _list {
- 	struct _list *next, *child;
+ struct imap_list {
+ 	struct imap_list *next, *child;
  	char *val;
  	int len;
- } list_t;
+ };
  
- typedef struct {
- 	int fd;
- } Socket_t;
+ struct imap_socket {
+ 	int fd[2];
+ 	SSL *ssl;
+ };
  
- typedef struct {
- 	Socket_t sock;
+ struct imap_buffer {
+ 	struct imap_socket sock;
  	int bytes;
  	int offset;
  	char buf[1024];