Merge tag 'l10n-2.10.0-rnd2.2' of git://github.com/git-l10n/git-po

diff --git a/upload-pack.c b/upload-pack.c
index f93787003a21b465c33ab8302347d80e46c10428..ca7f9417800bfb27a7dbc0559df8bec772c267fa 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -828,7 +828,7 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
        return parse_hide_refs_config(var, value, "uploadpack");
 }
 
-int main(int argc, const char **argv)
+int cmd_main(int argc, const char **argv)
 {
        const char *dir;
        int strict = 0;
@@ -836,7 +836,7 @@ int main(int argc, const char **argv)
                OPT_BOOL(0, "stateless-rpc", &stateless_rpc,
                         N_("quit after a single request/response exchange")),
                OPT_BOOL(0, "advertise-refs", &advertise_refs,
-                        N_("exit immediately after intial ref advertisement")),
+                        N_("exit immediately after initial ref advertisement")),
                OPT_BOOL(0, "strict", &strict,
                         N_("do not try <directory>/.git/ if <directory> is no Git directory")),
                OPT_INTEGER(0, "timeout", &timeout,
@@ -844,10 +844,7 @@ int main(int argc, const char **argv)
                OPT_END()
        };
 
-       git_setup_gettext();
-
        packet_trace_identity("upload-pack");
-       git_extract_argv0_path(argv[0]);
        check_replace_refs = 0;
 
        argc = parse_options(argc, argv, NULL, options, upload_pack_usage, 0);