Merge branch 'sb/t1020-cleanup'
commitce6ab232cae58d78d26edabc12e038e6b1959796
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:41:59 +0000 (22 12:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 May 2015 19:42:00 +0000 (22 12:42 -0700)
tree2583a9bdd4d1d34444142203b8392b894bba37ea
parent17e785f6bacee806767aee0ba48d8c76a99a9895
parent66d2e04ec9856b5ef667f5241774749d079a5109
Merge branch 'sb/t1020-cleanup'

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