Merge branch 'jk/credentials'

* jk/credentials:
  credentials: unable to connect to cache daemon
maint
Junio C Hamano 2012-01-09 15:58:47 -08:00
commit beecc7ab65
1 changed files with 3 additions and 4 deletions

View File

@ -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);
}