aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-02-05 23:52:25 -0800
committerJunio C Hamano <gitster@pobox.com>2012-02-05 23:52:25 -0800
commit110c511dbeff65f7ae92216cf1d976a9093d911f (patch)
treebe182723f2e79835e28f1bbab7c49b6d376858eb
parent00653435488f5ed86c5d6dc411fa14fa56f5e3bc (diff)
parentf174a2583c9f42315b60205890fa67a79a1f1669 (diff)
downloadgit-110c511dbeff65f7ae92216cf1d976a9093d911f.tar.gz
git-110c511dbeff65f7ae92216cf1d976a9093d911f.tar.xz
Sync with 1.7.6.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git.txt3
-rw-r--r--imap-send.c23
2 files changed, 2 insertions, 24 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 5c313e521..6803e1309 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -54,9 +54,10 @@ Documentation for older releases are available here:
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 --git a/imap-send.c b/imap-send.c
index e1ad1a48c..9992233b9 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -41,28 +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 @@ struct group_conf {
struct message {
struct message *next;
- /* struct string_list *keywords; */
size_t size; /* zero implies "not fetched" */
int uid;
unsigned char flags, status;