Merge branch 'jk/git-connection-deadlock-fix'

diff --git a/cache.h b/cache.h
index 4e9123b77bcc9eea114edf3db274e3e1a58f03e7..4ae773647ff5545ecd885d316f77fe6ae8cedad9 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -975,6 +975,7 @@ extern struct ref *find_ref_by_name(const struct ref *list, const char *name);
 extern char *git_getpass(const char *prompt);
 extern struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags);
 extern int finish_connect(struct child_process *conn);
+extern int git_connection_is_socket(struct child_process *conn);
 extern int path_match(const char *path, int nr, char **match);
 struct extra_have_objects {
        int nr, alloc;