projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 34df9fe c7730e6)
Merge branch 'jk/git-connection-deadlock-fix' into maint-1.7.4
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 17:28:10 +0000 (10:28 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2011 17:28:10 +0000 (10:28 -0700)
commitbac9c06ba093d9254cb2ab3eed074722a3e635a6
treea635335f31f8f0dfa7a679882cfab42429851a9btree | snapshot
parent34df9fe36a3627e1c2a9ae244820fb61e3891b90commit | diff
parentc7730e6f5f5757ac278319f33b94c32458e21f12commit | 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
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