summaryrefslogtreecommitdiff
path: root/credential-cache--daemon.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 /credential-cache--daemon.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 'credential-cache--daemon.c')
-rw-r--r--credential-cache--daemon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c
index 1f14d56e98..1e5f16a3a1 100644
--- a/credential-cache--daemon.c
+++ b/credential-cache--daemon.c
@@ -257,7 +257,7 @@ static void init_socket_directory(const char *path)
free(path_copy);
}
-int main(int argc, const char **argv)
+int cmd_main(int argc, const char **argv)
{
const char *socket_path;
int ignore_sighup = 0;