mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* 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()
This commit is contained in:
Junio C Hamano
2016-07-06 10:02:57 -07:00
parent 05219a1276 08aade7080
commit de61cebde7
53 changed files with 123 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fast-import.c
View File

@ -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);