From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 5 Jun 2015 19:00:14 +0000 (-0700)
Subject: Merge branch 'sb/t1020-cleanup' into maint
X-Git-Tag: v2.4.3~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e896a37c7aa3cf7bf770e7dd2d93af928a4140a;p=thirdparty%2Fgit.git

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

5e896a37c7aa3cf7bf770e7dd2d93af928a4140a