Merge branch 'jk/push-progress'

diff --git a/remote-curl.c b/remote-curl.c
index 672b382e5aaf25654f9095e68f45062baed3f397..6b83b7783e9c62fcf623acd0ba034dd1c0b9bd10 100644 (file)
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -984,14 +984,11 @@ static void parse_push(struct strbuf *buf)
        free(specs);
 }
 
-int main(int argc, const char **argv)
+int cmd_main(int argc, const char **argv)
 {
        struct strbuf buf = STRBUF_INIT;
        int nongit;
 
-       git_setup_gettext();
-
-       git_extract_argv0_path(argv[0]);
        setup_git_directory_gently(&nongit);
        if (argc < 2) {
                error("remote-curl: usage: git remote-curl <remote> [<url>]");