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 /t/helper/test-path-utils.c | |
| parent | Git 2.9 (diff) | |
| parent | mingw: declare main()'s argv as const (diff) | |
| download | tgif-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 't/helper/test-path-utils.c')
| -rw-r--r-- | t/helper/test-path-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/helper/test-path-utils.c b/t/helper/test-path-utils.c index ba805b374c..1ebe0f750c 100644 --- a/t/helper/test-path-utils.c +++ b/t/helper/test-path-utils.c @@ -156,7 +156,7 @@ static struct test_data dirname_data[] = { { NULL, NULL } }; -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) { char *buf = xmallocz(strlen(argv[2])); @@ -213,7 +213,7 @@ int main(int argc, char **argv) } if (argc >= 4 && !strcmp(argv[1], "prefix_path")) { - char *prefix = argv[2]; + const char *prefix = argv[2]; int prefix_len = strlen(prefix); int nongit_ok; setup_git_directory_gently(&nongit_ok); |