projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f09937d c7730e6)
Merge branch 'jk/git-connection-deadlock-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:33:25 +0000 (09:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 16:33:25 +0000 (09:33 -0700)
commit5590fe762ff9d68f6968d80979e446576e61e2e1
tree0900e26fc5c06b94be0cab1aac91ccb3b89c7eddtree | snapshot
parentf09937de964bb30e0614123daa9051afbffb4408commit | diff
parentc7730e6f5f5757ac278319f33b94c32458e21f12commit | diff
Merge branch 'jk/git-connection-deadlock-fix' into maint

* 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
Git—the stupid content tracker