summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-04-30 00:52:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-04-30 00:52:03 (GMT)
commita75aba4a5306d0fee6a8ee8b48943e2c19eb2750 (patch)
tree1c025323d5104e7621b4abb040806cc805c12a52 /builtin
parent55375e94736ba47a264ec0437fc723b2ed80919c (diff)
parent46e358158109200abde4de0a044a415c80c9bce5 (diff)
downloadgit-a75aba4a5306d0fee6a8ee8b48943e2c19eb2750.zip
git-a75aba4a5306d0fee6a8ee8b48943e2c19eb2750.tar.gz
git-a75aba4a5306d0fee6a8ee8b48943e2c19eb2750.tar.bz2
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
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions