From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 May 2015 19:41:59 +0000 (-0700)
Subject: Merge branch 'sb/t1020-cleanup'
X-Git-Tag: v2.5.0-rc0~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce6ab232cae58d78d26edabc12e038e6b1959796;p=thirdparty%2Fgit.git

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
---

ce6ab232cae58d78d26edabc12e038e6b1959796