From 28b22f8af9053109d1f09fef749b6b96ee41050a Mon Sep 17 00:00:00 2001
From: Jeff King <peff@peff.net>
Date: Mon, 6 Feb 2012 01:29:37 -0500
Subject: [PATCH 1/2] imap-send: remove dead code
The imap-send code was adapted from another project, and
still contains many unused bits of code. One of these bits
contains a type "struct string_list" which bears no
resemblence to the "struct string_list" we use elsewhere in
git. This causes the compiler to complain if git's
string_list ever becomes part of cache.h.
Let's just drop the dead code.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
imap-send.c | 23 -----------------------
1 file changed, 23 deletions(-)
diff --git a/imap-send.c b/imap-send.c
index e1ad1a48ce3..9992233b96b 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;
From f174a2583c9f42315b60205890fa67a79a1f1669 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 5 Feb 2012 23:46:44 -0800
Subject: [PATCH 2/2] Git 1.7.6.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Documentation/git.txt | 3 ++-
GIT-VERSION-GEN | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index bcedfc1a54a..e6b64dbde7a 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -44,9 +44,10 @@ unreleased) version of git, that is available from 'master'
branch of the `git.git` repository.
Documentation for older releases are available here:
-* 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/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 05954954464..803781d8c22 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.7.6.5
+DEF_VER=v1.7.6.6
LF='
'