Merge branch 'jk/tighten-alloc' into maint

diff --git a/upload-pack.c b/upload-pack.c
index 44d63fba4168db1f741747f824439d9234315578..26746f67e2387f91c4e7052a2d5224c271a8174b 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -813,20 +813,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;