Sync with 1.7.6.6

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

diff --combined Documentation/git.txt
index c991430642a56001a82b6526bda70d602af9e9dc,614693a83f951a35a8ead55dbd3f9f0a1256dbb7..f7e201fae30940ac00d1685bfd9411de9d81ca28
--- 1/Documentation/git.txt
--- 2/Documentation/git.txt
+++ b/Documentation/git.txt
@@@ -44,11 -44,6 +44,11 @@@ unreleased) version of git, that is ava
  branch of the `git.git` repository.
  Documentation for older releases are available here:
  
 +* link:v1.7.9/git.html[documentation for release 1.7.9]
 +
 +* release notes for
 +  link:RelNotes/1.7.9.txt[1.7.9].
 +
  * link:v1.7.8.4/git.html[documentation for release 1.7.8.4]
  
  * release notes for
@@@ -69,9 -64,10 +69,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 e40125a22b72544c107e365d4f09eaa3b1ce53de,12e8318dc6a690d159751803003a2fce4c9ab94c..972ad62cd92ff2b09fb5caa21b24f471009ef19b
--- 1/imap-send.c
--- 2/imap-send.c
+++ b/imap-send.c
@@@ -25,7 -25,6 +25,7 @@@
  #include "cache.h"
  #include "exec_cmd.h"
  #include "run-command.h"
 +#include "prompt.h"
  #ifdef NO_OPENSSL
  typedef void *SSL;
  #else
@@@ -42,28 -41,6 +42,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 */
@@@ -71,7 -48,6 +49,6 @@@
  
  struct message {
        struct message *next;
-       /* struct string_list *keywords; */
        size_t size; /* zero implies "not fetched" */
        int uid;
        unsigned char flags, status;
@@@ -1209,10 -1185,13 +1186,10 @@@ static struct store *imap_open_store(st
                        goto bail;
                }
                if (!srvc->pass) {
 -                      char prompt[80];
 -                      sprintf(prompt, "Password (%s@%s): ", srvc->user, srvc->host);
 -                      arg = git_getpass(prompt);
 -                      if (!arg) {
 -                              perror("getpass");
 -                              exit(1);
 -                      }
 +                      struct strbuf prompt = STRBUF_INIT;
 +                      strbuf_addf(&prompt, "Password (%s@%s): ", srvc->user, srvc->host);
 +                      arg = git_getpass(prompt.buf);
 +                      strbuf_release(&prompt);
                        if (!*arg) {
                                fprintf(stderr, "Skipping account %s@%s, no password\n", srvc->user, srvc->host);
                                goto bail;
@@@ -1536,8 -1515,6 +1513,8 @@@ int main(int argc, char **argv
  
        git_extract_argv0_path(argv[0]);
  
 +      git_setup_gettext();
 +
        if (argc != 1)
                usage(imap_send_usage);