Merge branch 'jc/t2300-setup'
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Jun 2016 22:26:04 +0000 (15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Jun 2016 22:26:04 +0000 (15:26 -0700)
commit8ffc9d26e41f1ce23acbaee0f14419d99677b5f9
treea2cfed2808df66c09005ee21734f0693588cc9e0
parent49fa3dc76179e04b0833542fa52d0f287a4955ac
parentfe17fc0006927246c5905ef9352e7e89a3c5814b
Merge branch 'jc/t2300-setup'

A test fix.

* jc/t2300-setup:
  t2300: run git-sh-setup in an environment that better mimics the real life