diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-05-20 03:37:20 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-20 03:37:20 (GMT) |
| commit | a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a (patch) | |
| tree | 9466bc040243464bfc29c60b6f92ce4d33acd4c5 /t/t4034/php/expect | |
| parent | 5c359a66586cfa802f9a4b205da9750582bdb9ec (diff) | |
| parent | c7730e6f5f5757ac278319f33b94c32458e21f12 (diff) | |
| download | git-a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a.zip git-a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a.tar.gz git-a66fae3827d4bf39ddfdc19bbb818d67e2a3c20a.tar.bz2 | |
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
Diffstat (limited to 't/t4034/php/expect')
0 files changed, 0 insertions, 0 deletions