aboutsummaryrefslogtreecommitdiff
path: root/upload-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-07-19 13:22:19 -0700
committerJunio C Hamano <gitster@pobox.com>2016-07-19 13:22:19 -0700
commitd4c6375fd8996d7d809fb34b9743339d7192c58b (patch)
tree958ff37108df971e18b2989cfc390d4dde80c41e /upload-pack.c
parentdf9da64a7c2aee12fd967cb9ff1730312d4b271d (diff)
parentde61cebde72a15b85b6e6a06ef4c3614b6afdac8 (diff)
downloadgit-d4c6375fd8996d7d809fb34b9743339d7192c58b.tar.gz
git-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 'upload-pack.c')
-rw-r--r--upload-pack.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/upload-pack.c b/upload-pack.c
index f93787003..d4cc414bc 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -828,7 +828,7 @@ static int upload_pack_config(const char *var, const char *value, void *unused)
return parse_hide_refs_config(var, value, "uploadpack");
}
-int main(int argc, const char **argv)
+int cmd_main(int argc, const char **argv)
{
const char *dir;
int strict = 0;
@@ -844,10 +844,7 @@ int main(int argc, const char **argv)
OPT_END()
};
- git_setup_gettext();
-
packet_trace_identity("upload-pack");
- git_extract_argv0_path(argv[0]);
check_replace_refs = 0;
argc = parse_options(argc, argv, NULL, options, upload_pack_usage, 0);