Skip to content

Commit

Permalink
credentials: unable to connect to cache daemon
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Clemens Buchacher authored and Junio C Hamano committed Jan 8, 2012
1 parent 861444f commit 98c2924
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions credential-cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 98c2924

Please sign in to comment.