Merge branch 'jk/credentials'

* jk/credentials: credentials: unable to connect to cache daemon
git-mirror · Jan 9, 2012 · beecc7a · beecc7a
2 parents d9af228 + 98c2924
commit beecc7a
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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);
 }