Merge branch 'ps/t1509-chroot-test-fixup' into maint
commitd11448f685f5fac85daef59f8dd98c723d438fe9
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Sep 2015 02:17:50 +0000 (3 19:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Sep 2015 02:17:50 +0000 (3 19:17 -0700)
treed94599988c3ab93820e341c6bcd2c79218c13e5e
parent8b2707101aa52d4da98becea0aa910de13768488
parentfaacc5aa7c3d9c0695bf0203b55c4fd77cd5cda3
Merge branch 'ps/t1509-chroot-test-fixup' into maint

t1509 test that requires a dedicated VM environment had some
bitrot, which has been corrected.

* ps/t1509-chroot-test-fixup:
  tests: fix cleanup after tests in t1509-root-worktree
  tests: fix broken && chains in t1509-root-worktree