| commit | 33e6c11c91f4b43768f85f5280a968cb33b72c0a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 May 2011 00:20:09 +0000 (16 17:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 17 May 2011 00:20:09 +0000 (16 17:20 -0700) | ||
| tree | f84b91650811d8205db4a183ed109343ad30c2fb | treesnapshot (tar.gz zip) |
| parent | ad8347050b2b5a9fa8f06bbc9f08e2c88c9492e5 | commitdiff |
| parent | a1a3fd1f40a67165b849a2a1210ff3a7a2cbcdd6 | commitdiff |
Merge branch 'jk/git-connection-deadlock-fix' into next
* jk/git-connection-deadlock-fix:
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:
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 | blobhistory | |
| cache.h | diff1 | diff2 | blobhistory |
| connect.c | diff1 | diff2 | blobhistory |