i18n: unpack-trees: avoid substituting only a verb in sentences

diff --git a/credential-cache.c b/credential-cache.c
index 193301877f1ee29f54c2da0b933d9b7fe10f157a..f4afdc6988c32cd95769dee488f8495b8a6ce5b6 100644 (file)
--- a/credential-cache.c
+++ b/credential-cache.c
@@ -37,12 +37,11 @@ static int send_request(const char *socket, const struct strbuf *out)
 
 static void spawn_daemon(const char *socket)
 {
-       struct child_process daemon;
+       struct child_process daemon = CHILD_PROCESS_INIT;
        const char *argv[] = { NULL, NULL, NULL };
        char buf[128];
        int r;
 
-       memset(&daemon, 0, sizeof(daemon));
        argv[0] = "git-credential-cache--daemon";
        argv[1] = socket;
        daemon.argv = argv;
@@ -72,7 +71,7 @@ static void do_cache(const char *socket, const char *action, int timeout,
        }
 
        if (send_request(socket, &buf) < 0) {
-               if (errno != ENOENT)
+               if (errno != ENOENT && errno != ECONNREFUSED)
                        die_errno("unable to connect to cache daemon");
                if (flags & FLAG_SPAWN) {
                        spawn_daemon(socket);
@@ -89,7 +88,7 @@ int main(int argc, const char **argv)
        int timeout = 900;
        const char *op;
        const char * const usage[] = {
-               "git credential-cache [options] <action>",
+               "git credential-cache [<options>] <action>",
                NULL
        };
        struct option options[] = {