diff options
| author | Clemens Buchacher <drizzd@aon.at> | 2012-01-07 11:54:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-08 22:38:25 (GMT) |
| commit | 98c2924cfa84a7f30b17636bd5632e53a0fa002e (patch) | |
| tree | 2e00484aa2bb84837350617c94b65f2823f04de1 /credential-cache.c | |
| parent | 861444f6d702b15713d0875ce9dc5aff64885fba (diff) | |
| download | git-98c2924cfa84a7f30b17636bd5632e53a0fa002e.zip git-98c2924cfa84a7f30b17636bd5632e53a0fa002e.tar.gz git-98c2924cfa84a7f30b17636bd5632e53a0fa002e.tar.bz2 | |
credentials: unable to connect to cache daemon
Error out if we just spawned the daemon and yet we cannot connect.
And always release the string buffer.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'credential-cache.c')
| -rw-r--r-- | credential-cache.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/credential-cache.c b/credential-cache.c index dc98372..b15a9a7 100644 --- a/credential-cache.c +++ b/credential-cache.c @@ -71,11 +71,10 @@ static void do_cache(const char *socket, const char *action, int timeout, die_errno("unable to relay credential"); } - if (!send_request(socket, &buf)) - return; - if (flags & FLAG_SPAWN) { + if (send_request(socket, &buf) < 0 && (flags & FLAG_SPAWN)) { spawn_daemon(socket); - send_request(socket, &buf); + if (send_request(socket, &buf) < 0) + die_errno("unable to connect to cache daemon"); } strbuf_release(&buf); } |