Merge branch 'jc/grep-commandline-vs-configuration'

diff --git a/http-backend.c b/http-backend.c
index 214881459d828101fa0927321c5a8facb3a540f0..0d59499a51d7f1eecf5b28254b624a991f0e1db4 100644 (file)
--- a/http-backend.c
+++ b/http-backend.c
@@ -632,7 +632,7 @@ static struct service_cmd {
        {"POST", "/git-receive-pack$", service_rpc}
 };
 
-int main(int argc, char **argv)
+int cmd_main(int argc, const char **argv)
 {
        char *method = getenv("REQUEST_METHOD");
        char *dir;
@@ -640,9 +640,6 @@ int main(int argc, char **argv)
        char *cmd_arg = NULL;
        int i;
 
-       git_setup_gettext();
-
-       git_extract_argv0_path(argv[0]);
        set_die_routine(die_webcgi);
        set_die_is_recursing_routine(die_webcgi_recursing);