diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-06 19:02:57 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-06 19:02:57 +0200 |
commit | de61cebde72a15b85b6e6a06ef4c3614b6afdac8 (patch) | |
tree | 7d0e816e7e7718a17c07b3b73b753710b879c7c5 /t/helper/test-sha1-array.c | |
parent | Git 2.9 (diff) | |
parent | mingw: declare main()'s argv as const (diff) | |
download | git-de61cebde72a15b85b6e6a06ef4c3614b6afdac8.tar.xz git-de61cebde72a15b85b6e6a06ef4c3614b6afdac8.zip |
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-sha1-array.c')
-rw-r--r-- | t/helper/test-sha1-array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/helper/test-sha1-array.c b/t/helper/test-sha1-array.c index 60ea1d5f14..09f7790971 100644 --- a/t/helper/test-sha1-array.c +++ b/t/helper/test-sha1-array.c @@ -6,7 +6,7 @@ static void print_sha1(const unsigned char sha1[20], void *data) puts(sha1_to_hex(sha1)); } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { struct sha1_array array = SHA1_ARRAY_INIT; struct strbuf line = STRBUF_INIT; |