Merge branch 'jk/common-main-2.8' into jk/common-main

diff --git a/upload-pack.c b/upload-pack.c
index f19444df7bc9c19da4d2f3bf831525f7a5d6034d..b97a7659d1f2ffeb8e63fa46a17ca1501db983ab 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -816,20 +816,17 @@ 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, char **argv)
+int cmd_main(int argc, const char **argv)
 {
-       char *dir;
+       const char *dir;
        int i;
        int strict = 0;
 
-       git_setup_gettext();
-
        packet_trace_identity("upload-pack");
-       git_extract_argv0_path(argv[0]);
        check_replace_refs = 0;
 
        for (i = 1; i < argc; i++) {
-               char *arg = argv[i];
+               const char *arg = argv[i];
 
                if (arg[0] != '-')
                        break;