Merge branch 'mm/status-suggest-merge-abort'

diff --git a/imap-send.c b/imap-send.c
index 50377c5b88d59a3563b49e669b93f17009bcdd19..db0fafee995874824f91cb8378399fcf720d705c 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -1495,16 +1495,12 @@ static int curl_append_msgs_to_imap(struct imap_server_conf *server,
 }
 #endif
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
        struct strbuf all_msgs = STRBUF_INIT;
        int total;
        int nongit_ok;
 
-       git_extract_argv0_path(argv[0]);
-
-       git_setup_gettext();
-
        setup_git_directory_gently(&nongit_ok);
        git_imap_config();