Merge branch 'js/daemon-test-race-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Apr 2012 00:52:02 +0000 (17:52 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Apr 2012 00:52:03 +0000 (17:52 -0700)
commita75aba4a5306d0fee6a8ee8b48943e2c19eb2750
tree1c025323d5104e7621b4abb040806cc805c12a52
parent55375e94736ba47a264ec0437fc723b2ed80919c
parent46e358158109200abde4de0a044a415c80c9bce5
Merge branch 'js/daemon-test-race-fix'

The shell construct to launch git-daemon and wait for it to start
serving during the test was faulty, and this fixes it.

By Johannes Sixt
* js/daemon-test-race-fix:
  t5570: fix forwarding of git-daemon messages via cat