stash: Don't fail if work dir contains file named 'HEAD'

[git.git] / imap-send.c

diff --git a/imap-send.c b/imap-send.c
index 4c1e8971137d41960f3b8eced63d96f41dc603a1..e40125a22b72544c107e365d4f09eaa3b1ce53de 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -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
@@ -161,7 +162,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
@@ -1213,10 +1213,6 @@ static struct store *imap_open_store(struct imap_server_conf *srvc)
                        strbuf_addf(&prompt, "Password (%s@%s): ", srvc->user, srvc->host);
                        arg = git_getpass(prompt.buf);
                        strbuf_release(&prompt);
-                       if (!arg) {
-                               perror("getpass");
-                               exit(1);
-                       }
                        if (!*arg) {
                                fprintf(stderr, "Skipping account %s@%s, no password\n", srvc->user, srvc->host);
                                goto bail;
@@ -1540,6 +1536,8 @@ int main(int argc, char **argv)
 
        git_extract_argv0_path(argv[0]);
 
+       git_setup_gettext();
+
        if (argc != 1)
                usage(imap_send_usage);