diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-15 14:11:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-15 14:11:42 -0700 |
| commit | 509cc1d41394ea0d2308288a0cd3170c5774666e (patch) | |
| tree | 28b7a235350326062df4be92572b6eff44eadfa1 /builtin | |
| parent | 8f7582d995682f785e80e344197cc715e6bc7d8e (diff) | |
| parent | 2406bf5fc5fbaa042e05fc0001ba72beb888d60f (diff) | |
| download | git-509cc1d41394ea0d2308288a0cd3170c5774666e.tar.gz | |
Merge branch 'ma/win32-unix-domain-socket'
Windows binary used to decide the use of unix-domain socket at
build time, but it learned to make the decision at runtime instead.
* ma/win32-unix-domain-socket:
Win32: detect unix socket support at runtime
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/credential-cache--daemon.c | 2 | ||||
| -rw-r--r-- | builtin/credential-cache.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/builtin/credential-cache--daemon.c b/builtin/credential-cache--daemon.c index 3a6a750a8e..17f929dede 100644 --- a/builtin/credential-cache--daemon.c +++ b/builtin/credential-cache--daemon.c @@ -294,6 +294,8 @@ int cmd_credential_cache_daemon(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, usage, 0); socket_path = argv[0]; + if (!have_unix_sockets()) + die(_("credential-cache--daemon unavailable; no unix socket support")); if (!socket_path) usage_with_options(usage, options); diff --git a/builtin/credential-cache.c b/builtin/credential-cache.c index bba96d4ffd..bef120b537 100644 --- a/builtin/credential-cache.c +++ b/builtin/credential-cache.c @@ -149,6 +149,9 @@ int cmd_credential_cache(int argc, const char **argv, const char *prefix) usage_with_options(usage, options); op = argv[0]; + if (!have_unix_sockets()) + die(_("credential-cache unavailable; no unix socket support")); + if (!socket_path) socket_path = get_socket_path(); if (!socket_path) |