diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-07-19 13:22:19 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-07-19 13:22:19 -0700 |
commit | d4c6375fd8996d7d809fb34b9743339d7192c58b (patch) | |
tree | 958ff37108df971e18b2989cfc390d4dde80c41e /t/helper/test-submodule-config.c | |
parent | Merge branch 'ak/lazy-prereq-mktemp' (diff) | |
parent | Merge branch 'jk/common-main-2.8' into jk/common-main (diff) | |
download | tgif-d4c6375fd8996d7d809fb34b9743339d7192c58b.tar.xz |
Merge branch 'jk/common-main'
There are certain house-keeping tasks that need to be performed at
the very beginning of any Git program, and programs that are not
built-in commands had to do them exactly the same way as "git"
potty does. It was easy to make mistakes in one-off standalone
programs (like test helpers). A common "main()" function that
calls cmd_main() of individual program has been introduced to
make it harder to make mistakes.
* jk/common-main:
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-submodule-config.c')
-rw-r--r-- | t/helper/test-submodule-config.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/helper/test-submodule-config.c b/t/helper/test-submodule-config.c index 7922ffba1d..61049b87a0 100644 --- a/t/helper/test-submodule-config.c +++ b/t/helper/test-submodule-config.c @@ -2,7 +2,7 @@ #include "submodule-config.h" #include "submodule.h" -static void die_usage(int argc, char **argv, const char *msg) +static void die_usage(int argc, const char **argv, const char *msg) { fprintf(stderr, "%s\n", msg); fprintf(stderr, "Usage: %s [<commit> <submodulepath>] ...\n", argv[0]); @@ -14,9 +14,9 @@ static int git_test_config(const char *var, const char *value, void *cb) return parse_submodule_config_option(var, value); } -int main(int argc, char **argv) +int cmd_main(int argc, const char **argv) { - char **arg = argv; + const char **arg = argv; int my_argc = argc; int output_url = 0; int lookup_name = 0; |