diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-01-09 15:58:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-09 15:58:47 -0800 |
| commit | beecc7ab65b31c5471331e64acaa3f722125ea67 (patch) | |
| tree | ee63da96fb27dc057ed70bf4a9dbaf10a6b3b949 | |
| parent | d9af2282c0cabccdb058615cd5c17ffbf74b2c69 (diff) | |
| parent | 98c2924cfa84a7f30b17636bd5632e53a0fa002e (diff) | |
| download | git-beecc7ab65b31c5471331e64acaa3f722125ea67.tar.gz | |
Merge branch 'jk/credentials'
* jk/credentials:
credentials: unable to connect to cache daemon
| -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 dc98372e59..b15a9a7449 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); } |