From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Feb 2012 07:52:53 +0000 (-0800)
Subject: Sync with 1.7.6.6
X-Git-Tag: v1.7.9.1~3^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d0482e88a735787f7bb33ef4783be0e7f6a70946;hp=-c;p=git.git

Sync with 1.7.6.6

* maint-1.7.7:
  Git 1.7.6.6
  imap-send: remove dead code
---

d0482e88a735787f7bb33ef4783be0e7f6a70946
diff --combined Documentation/git.txt
index db5d5570c,6803e1309..614693a83
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -44,19 -44,9 +44,19 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 -* link:v1.7.7.5/git.html[documentation for release 1.7.7.5]
 +* link:v1.7.8.4/git.html[documentation for release 1.7.8.4]
  
  * release notes for
 +  link:RelNotes/1.7.8.4.txt[1.7.8.4],
 +  link:RelNotes/1.7.8.3.txt[1.7.8.3],
 +  link:RelNotes/1.7.8.2.txt[1.7.8.2],
 +  link:RelNotes/1.7.8.1.txt[1.7.8.1],
 +  link:RelNotes/1.7.8.txt[1.7.8].
 +
 +* link:v1.7.7.6/git.html[documentation for release 1.7.7.6]
 +
 +* release notes for
 +  link:RelNotes/1.7.7.6.txt[1.7.7.6],
    link:RelNotes/1.7.7.5.txt[1.7.7.5],
    link:RelNotes/1.7.7.4.txt[1.7.7.4],
    link:RelNotes/1.7.7.3.txt[1.7.7.3],
@@@ -64,9 -54,10 +64,10 @@@
    link:RelNotes/1.7.7.1.txt[1.7.7.1],
    link:RelNotes/1.7.7.txt[1.7.7].
  
- * link:v1.7.6.5/git.html[documentation for release 1.7.6.5]
+ * link:v1.7.6.6/git.html[documentation for release 1.7.6.6]
  
  * release notes for
+   link:RelNotes/1.7.6.6.txt[1.7.6.6],
    link:RelNotes/1.7.6.5.txt[1.7.6.5],
    link:RelNotes/1.7.6.4.txt[1.7.6.4],
    link:RelNotes/1.7.6.3.txt[1.7.6.3],
diff --combined imap-send.c
index 80e0e8c05,9992233b9..12e8318dc
--- a/imap-send.c
+++ b/imap-send.c
@@@ -41,28 -41,6 +41,6 @@@ struct store_conf 
  	unsigned trash_remote_new:1, trash_only_new:1;
  };
  
- struct string_list {
- 	struct string_list *next;
- 	char string[1];
- };
- 
- struct channel_conf {
- 	struct channel_conf *next;
- 	char *name;
- 	struct store_conf *master, *slave;
- 	char *master_name, *slave_name;
- 	char *sync_state;
- 	struct string_list *patterns;
- 	int mops, sops;
- 	unsigned max_messages; /* for slave only */
- };
- 
- struct group_conf {
- 	struct group_conf *next;
- 	char *name;
- 	struct string_list *channels;
- };
- 
  /* For message->status */
  #define M_RECENT       (1<<0) /* unsyncable flag; maildir_* depend on this being 1<<0 */
  #define M_DEAD         (1<<1) /* expunged */
@@@ -70,7 -48,6 +48,6 @@@
  
  struct message {
  	struct message *next;
- 	/* struct string_list *keywords; */
  	size_t size; /* zero implies "not fetched" */
  	int uid;
  	unsigned char flags, status;
@@@ -161,6 -138,7 +138,6 @@@ static struct imap_server_conf server 
  struct imap_store_conf {
  	struct store_conf gen;
  	struct imap_server_conf *server;
 -	unsigned use_namespace:1;
  };
  
  #define NIL	(void *)0x1