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 /fast-import.c | |
| parent | 05219a1276341e72d8082d76b7f5ed394b7437a4 (diff) | |
| parent | 08aade7080ef7955eb356c6590187be3b55dcbcd (diff) | |
| download | git-de61cebde72a15b85b6e6a06ef4c3614b6afdac8.tar.gz git-de61cebde72a15b85b6e6a06ef4c3614b6afdac8.tar.xz | |
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 'fast-import.c')
| -rw-r--r-- | fast-import.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fast-import.c b/fast-import.c index c504ef752..84a13756c 100644 --- a/fast-import.c +++ b/fast-import.c @@ -164,7 +164,6 @@ Format of STDIN stream: #include "refs.h" #include "csum-file.h" #include "quote.h" -#include "exec_cmd.h" #include "dir.h" #define PACK_ID_BITS 16 @@ -300,7 +299,7 @@ static int failure; static FILE *pack_edges; static unsigned int show_stats = 1; static int global_argc; -static char **global_argv; +static const char **global_argv; /* Memory pools */ static size_t mem_pool_alloc = 2*1024*1024 - sizeof(struct mem_pool); @@ -3384,14 +3383,10 @@ static void parse_argv(void) read_marks(); } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { unsigned int i; - git_extract_argv0_path(argv[0]); - - git_setup_gettext(); - if (argc == 2 && !strcmp(argv[1], "-h")) usage(fast_import_usage); |