Merge branch 'sb/t1020-cleanup' into next
commitfa74b146080cd8e488cb0bb33f48a3f5ba03f589
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2015 22:07:18 +0000 (20 15:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 May 2015 22:07:18 +0000 (20 15:07 -0700)
treeddbccbcc21aac5231f867ce222886591efc1bb40
parentdb6ce78f31276321228d4ad15a2c6c6d3f710cbd
parent66d2e04ec9856b5ef667f5241774749d079a5109
Merge branch 'sb/t1020-cleanup' into next

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