summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-26 16:33:25 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-26 16:33:25 (GMT)
commit5590fe762ff9d68f6968d80979e446576e61e2e1 (patch)
tree0900e26fc5c06b94be0cab1aac91ccb3b89c7edd /cache.h
parentf09937de964bb30e0614123daa9051afbffb4408 (diff)
parentc7730e6f5f5757ac278319f33b94c32458e21f12 (diff)
downloadgit-5590fe762ff9d68f6968d80979e446576e61e2e1.zip
git-5590fe762ff9d68f6968d80979e446576e61e2e1.tar.gz
git-5590fe762ff9d68f6968d80979e446576e61e2e1.tar.bz2
Merge branch 'jk/git-connection-deadlock-fix' into maint
* jk/git-connection-deadlock-fix: test core.gitproxy configuration send-pack: avoid deadlock on git:// push with failed pack-objects connect: let callers know if connection is a socket connect: treat generic proxy processes like ssh processes Conflicts: connect.c
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 28899b7..dd34fed 100644
--- a/cache.h
+++ b/cache.h
@@ -965,6 +965,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;