Merge branch 'master' into next
commitcbd01587ec200bc3db1c1bdc66c3030a38e7f2d3
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Mar 2011 22:08:19 +0000 (29 15:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Mar 2011 22:08:19 +0000 (29 15:08 -0700)
treea9b9b35c402b71ed159dc3bdc372a5a34734d810
parentad968c8ebd3bee0d00a9fe1a2e07ee48f7bb33b4
parent537d99033749591245ddd36f7317fd6b8555d803
Merge branch 'master' into next

* master:
  Revert two "no-done" reverts
  enable "no-done" extension only when serving over smart-http
  Fix potential local deadlock during fetch-pack
  enable "no-done" extension only when fetching over smart-http
  HOME must be set before calling git-init when creating test repositories