From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Jul 2013 20:06:02 +0000 (-0700)
Subject: Merge branch 'tr/test-v-and-v-subtest-only'
X-Git-Tag: v1.8.4-rc0~75
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/f3930e4389937eccdcaa204b134010e3c34463a4?hp=5b6cd0fe7b876698007c55c577ae2afd49b50c2b

Merge branch 'tr/test-v-and-v-subtest-only'

Finishing touches to a topic that is already in master for the
upcoming release.

* tr/test-v-and-v-subtest-only:
t0000: do not use export X=Y
---

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 5c32288380..10be52beed 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -53,7 +53,8 @@ run_sub_test_lib_test () {
 		# Pretend we're a test harness.  This prevents
 		# test-lib from writing the counts to a file that will
 		# later be summarized, showing spurious "failed" tests
-		export HARNESS_ACTIVE=t &&
+		HARNESS_ACTIVE=t &&
+		export HARNESS_ACTIVE &&
 		cd "$name" &&
 		cat >"$name.sh" <<-EOF &&
 		#!$SHELL_PATH