summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-26 17:28:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-26 17:28:10 (GMT)
commitbac9c06ba093d9254cb2ab3eed074722a3e635a6 (patch)
treea635335f31f8f0dfa7a679882cfab42429851a9b /cache.h
parent34df9fe36a3627e1c2a9ae244820fb61e3891b90 (diff)
parentc7730e6f5f5757ac278319f33b94c32458e21f12 (diff)
downloadgit-bac9c06ba093d9254cb2ab3eed074722a3e635a6.zip
git-bac9c06ba093d9254cb2ab3eed074722a3e635a6.tar.gz
git-bac9c06ba093d9254cb2ab3eed074722a3e635a6.tar.bz2
Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4
* 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 342b410..5e9675d 100644
--- a/cache.h
+++ b/cache.h
@@ -946,6 +946,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;