config: resolve symlinks in conditional include's patterns

diff --git a/credential-cache.c b/credential-cache.c
index 86e21de49be4d48defd3e9da5cde170291bca600..774d1469fb533c0e68fec648d7348f3bc7443f24 100644 (file)
--- a/credential-cache.c
+++ b/credential-cache.c
@@ -83,7 +83,7 @@ static void do_cache(const char *socket, const char *action, int timeout,
        strbuf_release(&buf);
 }
 
-int main(int argc, const char **argv)
+int cmd_main(int argc, const char **argv)
 {
        char *socket_path = NULL;
        int timeout = 900;
@@ -106,7 +106,7 @@ int main(int argc, const char **argv)
        op = argv[0];
 
        if (!socket_path)
-               socket_path = expand_user_path("~/.git-credential-cache/socket");
+               socket_path = expand_user_path("~/.git-credential-cache/socket", 0);
        if (!socket_path)
                die("unable to find a suitable socket path; use --socket");