Merge branch 'sb/t1020-cleanup' into maint
commit5e896a37c7aa3cf7bf770e7dd2d93af928a4140a
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:14 +0000 (5 12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:14 +0000 (5 12:00 -0700)
tree8a0ade7025ba1b8de419194dad2dcc1da9d26072
parente9f767ecee21af47fa5515ee6f8106d70cabe983
parent66d2e04ec9856b5ef667f5241774749d079a5109
Merge branch 'sb/t1020-cleanup' into maint

There was a commented-out (instead of being marked to expect
failure) test that documented a breakage that was fixed since the
test was written; turn it into a proper test.

* sb/t1020-cleanup:
  subdirectory tests: code cleanup, uncomment test
t/t1020-subdirectory.sh