diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 10:02:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 10:02:57 -0700 |
| commit | de61cebde72a15b85b6e6a06ef4c3614b6afdac8 (patch) | |
| tree | 7d0e816e7e7718a17c07b3b73b753710b879c7c5 /http-push.c | |
| parent | 05219a1276341e72d8082d76b7f5ed394b7437a4 (diff) | |
| parent | 08aade7080ef7955eb356c6590187be3b55dcbcd (diff) | |
| download | git-de61cebde72a15b85b6e6a06ef4c3614b6afdac8.tar.gz | |
Merge branch 'jk/common-main-2.8' into jk/common-main
* jk/common-main-2.8:
mingw: declare main()'s argv as const
common-main: call git_setup_gettext()
common-main: call restore_sigpipe_to_default()
common-main: call sanitize_stdfds()
common-main: call git_extract_argv0_path()
add an extra level of indirection to main()
Diffstat (limited to 'http-push.c')
| -rw-r--r-- | http-push.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/http-push.c b/http-push.c index a092f0288b..dacada9094 100644 --- a/http-push.c +++ b/http-push.c @@ -1692,12 +1692,12 @@ static void run_request_queue(void) #endif } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { struct transfer_request *request; struct transfer_request *next_request; int nr_refspec = 0; - char **refspec = NULL; + const char **refspec = NULL; struct remote_lock *ref_lock = NULL; struct remote_lock *info_ref_lock = NULL; struct rev_info revs; @@ -1709,15 +1709,11 @@ int main(int argc, char **argv) int new_refs; struct ref *ref, *local_refs; - git_setup_gettext(); - - git_extract_argv0_path(argv[0]); - repo = xcalloc(1, sizeof(*repo)); argv++; for (i = 1; i < argc; i++, argv++) { - char *arg = *argv; + const char *arg = *argv; if (*arg == '-') { if (!strcmp(arg, "--all")) { |