Merge branch 'pw/t5800-import-race-fix' into next
commite97bb42be4b5dd3d7dcaccc75793f43855094735
authorJunio C Hamano <gitster@pobox.com>
Tue, 24 Apr 2012 22:24:36 +0000 (24 15:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 24 Apr 2012 22:24:36 +0000 (24 15:24 -0700)
treeb530e7ee5f9412b1a0190cefebd85ca470dab370
parent91d2dfdea7b1bf6a698d5a3d894f9ac6cd7fe753
parent7fb8e163bdfdc5ffb69b98f3f05ef0dbade4e677
Merge branch 'pw/t5800-import-race-fix' into next

Longstanding bug in a test scaffolding that occasionally made t5800
hang was fixed.

By Pete Wyckoff
* pw/t5800-import-race-fix:
  git-remote-testgit: fix race when spawning fast-import