diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 17:02:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 17:02:57 (GMT) |
| commit | de61cebde72a15b85b6e6a06ef4c3614b6afdac8 (patch) | |
| tree | 7d0e816e7e7718a17c07b3b73b753710b879c7c5 /t/helper/test-parse-options.c | |
| parent | 05219a1276341e72d8082d76b7f5ed394b7437a4 (diff) | |
| parent | 08aade7080ef7955eb356c6590187be3b55dcbcd (diff) | |
| download | git-de61cebde72a15b85b6e6a06ef4c3614b6afdac8.zip git-de61cebde72a15b85b6e6a06ef4c3614b6afdac8.tar.gz git-de61cebde72a15b85b6e6a06ef4c3614b6afdac8.tar.bz2 | |
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 't/helper/test-parse-options.c')
| -rw-r--r-- | t/helper/test-parse-options.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c index 8a1235d..d51d292 100644 --- a/t/helper/test-parse-options.c +++ b/t/helper/test-parse-options.c @@ -94,7 +94,7 @@ static void show(struct string_list *expect, int *status, const char *fmt, ...) strbuf_release(&buf); } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { const char *prefix = "prefix/"; const char *usage[] = { |