![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 May 2011 17:28:10 +0000 (10:28 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 26 May 2011 17:28:10 +0000 (10:28 -0700) | ||
| commit | bac9c06ba093d9254cb2ab3eed074722a3e635a6 | |
| tree | a635335f31f8f0dfa7a679882cfab42429851a9b | tree | snapshot |
| parent | 34df9fe36a3627e1c2a9ae244820fb61e3891b90 | commit | diff |
| parent | c7730e6f5f5757ac278319f33b94c32458e21f12 | commit | diff |
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
* 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 | | | | blob | history |
| cache.h | diff1 | | diff2 | | blob | history |
| connect.c | diff1 | | diff2 | | blob | history |