Merge branch 'tb/core-eol-fix' into maint

diff --git a/credential-cache.c b/credential-cache.c
index 8689a1519a5635a1d92e9e4106936b4159d2e106..86e21de49be4d48defd3e9da5cde170291bca600 100644 (file)
--- a/credential-cache.c
+++ b/credential-cache.c
@@ -32,6 +32,7 @@ static int send_request(const char *socket, const struct strbuf *out)
                write_or_die(1, in, r);
                got_data = 1;
        }
+       close(fd);
        return got_data;
 }
 
@@ -88,7 +89,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[] = {