summaryrefslogtreecommitdiff
path: root/t/helper/test-match-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-06 10:02:57 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-06 10:02:57 -0700
commitde61cebde72a15b85b6e6a06ef4c3614b6afdac8 (patch)
tree7d0e816e7e7718a17c07b3b73b753710b879c7c5 /t/helper/test-match-trees.c
parent05219a1276341e72d8082d76b7f5ed394b7437a4 (diff)
parent08aade7080ef7955eb356c6590187be3b55dcbcd (diff)
downloadgit-de61cebde72a15b85b6e6a06ef4c3614b6afdac8.tar.gz
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-match-trees.c')
-rw-r--r--t/helper/test-match-trees.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c
index d446b8eaca..e939502863 100644
--- a/t/helper/test-match-trees.c
+++ b/t/helper/test-match-trees.c
@@ -1,7 +1,7 @@
#include "cache.h"
#include "tree.h"
-int main(int ac, char **av)
+int cmd_main(int ac, const char **av)
{
struct object_id hash1, hash2, shifted;
struct tree *one, *two;