summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-20 03:37:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-20 03:37:20 (GMT)
commita66fae3827d4bf39ddfdc19bbb818d67e2a3c20a (patch)
tree9466bc040243464bfc29c60b6f92ce4d33acd4c5 /cache.h
parent5c359a66586cfa802f9a4b205da9750582bdb9ec (diff)
parentc7730e6f5f5757ac278319f33b94c32458e21f12 (diff)
downloadgit-a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a.zip
git-a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a.tar.gz
git-a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a.tar.bz2
Merge branch 'jk/git-connection-deadlock-fix'
* 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 4e9123b..4ae7736 100644
--- 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;