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

diff --cc builtin/send-pack.c
Simple merge

diff --cc cache.h
index 342b4100f12d5a56262a13290c27298431e82325,724aad41bac20be6de9d375bac8d5d12c1c6a1b2..5e9675d76d83632ee23ed8bad6340929edf7560f
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -943,9 -863,9 +943,10 @@@ struct ref 
  extern struct ref *find_ref_by_name(const struct ref *list, const char *name);
  
  #define CONNECT_VERBOSE       (1u << 0)
 +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;

diff --cc connect.c
index 57dc20c43ca1ba205ec0a18e263f9dde081390f4,9b31af02baa51d4994acb5ee9bb9e88aeb31044a..2119c3f74edcd2a976ff0e375c5d8d60d40da2ec
--- 1/connect.c
--- 2/connect.c
+++ b/connect.c
@@@ -395,14 -403,31 +395,15 @@@ static int git_use_proxy(const char *ho
        return (git_proxy_command && *git_proxy_command);
  }
  
- static void git_proxy_connect(int fd[2], char *host)
+ static struct child_process *git_proxy_connect(int fd[2], char *host)
  {
        const char *port = STR(DEFAULT_GIT_PORT);
-       const char *argv[4];
-       struct child_process proxy;
 -      char *colon, *end;
+       const char **argv;
+       struct child_process *proxy;
  
 -      if (host[0] == '[') {
 -              end = strchr(host + 1, ']');
 -              if (end) {
 -                      *end = 0;
 -                      end++;
 -                      host++;
 -              } else
 -                      end = host;
 -      } else
 -              end = host;
 -      colon = strchr(end, ':');
 -
 -      if (colon) {
 -              *colon = 0;
 -              port = colon + 1;
 -      }
 +      get_host_and_port(&host, &port);
  
+       argv = xmalloc(sizeof(*argv) * 4);
        argv[0] = git_proxy_command;
        argv[1] = host;
        argv[2] = port;