mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4

Browse Source 
* 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
This commit is contained in:
Junio C Hamano
2011-05-26 10:28:10 -07:00
parent 34df9fe36a c7730e6f5f
commit bac9c06ba0
4 changed files with 67 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -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;