projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5c359a6 c7730e6)
Merge branch 'jk/git-connection-deadlock-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:20 +0000 (20:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2011 03:37:20 +0000 (20:37 -0700)
commita66fae3827d4bf39ddfdc19bbb818d67e2a3c20a
tree9466bc040243464bfc29c60b6f92ce4d33acd4c5tree | snapshot
parent5c359a66586cfa802f9a4b205da9750582bdb9eccommit | diff
parentc7730e6f5f5757ac278319f33b94c32458e21f12commit | diff
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
builtin/send-pack.c diff1 | diff2 | blob | history
cache.h diff1 | diff2 | blob | history
connect.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.