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://git.lorimer.id.au/gitweb.git/diff_plain/f3930e4389937eccdcaa204b134010e3c34463a4?ds=inline;hp=-c

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

f3930e4389937eccdcaa204b134010e3c34463a4
diff --combined t/t0000-basic.sh
index 5c32288380,57ebb1f0d1..10be52beed
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@@ -53,7 -53,8 +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
@@@ -426,6 -427,22 +427,6 @@@ test_expect_success 'validate object I
  
  # Various types of objects
  
 -# Some filesystems do not support symblic links; on such systems
 -# some expected values are different
 -if test_have_prereq SYMLINKS
 -then
 -	expectfilter=cat
 -	expectedtree=087704a96baf1c2d1c869a8b084481e121c88b5b
 -	expectedptree1=21ae8269cacbe57ae09138dcc3a2887f904d02b3
 -	expectedptree2=3c5e5399f3a333eddecce7a9b9465b63f65f51e2
 -else
 -	expectfilter='grep -v sym'
 -	expectedtree=8e18edf7d7edcf4371a3ac6ae5f07c2641db7c46
 -	expectedptree1=cfb8591b2f65de8b8cc1020cd7d9e67e7793b325
 -	expectedptree2=ce580448f0148b985a513b693fdf7d802cacb44f
 -fi
 -
 -
  test_expect_success 'adding various types of objects with git update-index --add' '
  	mkdir path2 path3 path3/subp3 &&
  	paths="path0 path2/file2 path3/file3 path3/subp3/file3" &&
@@@ -433,7 -450,10 +434,7 @@@
  		for p in $paths
  		do
  			echo "hello $p" >$p || exit 1
 -			if test_have_prereq SYMLINKS
 -			then
 -				ln -s "hello $p" ${p}sym || exit 1
 -			fi
 +			test_ln_s_add "hello $p" ${p}sym || exit 1
  		done
  	) &&
  	find path* ! -type d -print | xargs git update-index --add
@@@ -445,7 -465,7 +446,7 @@@ test_expect_success 'showing stage wit
  '
  
  test_expect_success 'validate git ls-files output for a known tree' '
 -	$expectfilter >expected <<-\EOF &&
 +	cat >expected <<-\EOF &&
  	100644 f87290f8eb2cbbea7857214459a0739927eab154 0	path0
  	120000 15a98433ae33114b085f3eb3bb03b832b3180a01 0	path0sym
  	100644 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 0	path2/file2
@@@ -463,14 -483,14 +464,14 @@@ test_expect_success 'writing tree out w
  '
  
  test_expect_success 'validate object ID for a known tree' '
 -	test "$tree" = "$expectedtree"
 +	test "$tree" = 087704a96baf1c2d1c869a8b084481e121c88b5b
  '
  
  test_expect_success 'showing tree with git ls-tree' '
      git ls-tree $tree >current
  '
  
 -test_expect_success SYMLINKS 'git ls-tree output for a known tree' '
 +test_expect_success 'git ls-tree output for a known tree' '
  	cat >expected <<-\EOF &&
  	100644 blob f87290f8eb2cbbea7857214459a0739927eab154	path0
  	120000 blob 15a98433ae33114b085f3eb3bb03b832b3180a01	path0sym
@@@ -487,7 -507,7 +488,7 @@@ test_expect_success 'showing tree with 
  '
  
  test_expect_success 'git ls-tree -r output for a known tree' '
 -	$expectfilter >expected <<-\EOF &&
 +	cat >expected <<-\EOF &&
  	100644 blob f87290f8eb2cbbea7857214459a0739927eab154	path0
  	120000 blob 15a98433ae33114b085f3eb3bb03b832b3180a01	path0sym
  	100644 blob 3feff949ed00a62d9f7af97c15cd8a30595e7ac7	path2/file2
@@@ -505,7 -525,7 +506,7 @@@ test_expect_success 'showing tree with 
  	git ls-tree -r -t $tree >current
  '
  
 -test_expect_success SYMLINKS 'git ls-tree -r output for a known tree' '
 +test_expect_success 'git ls-tree -r output for a known tree' '
  	cat >expected <<-\EOF &&
  	100644 blob f87290f8eb2cbbea7857214459a0739927eab154	path0
  	120000 blob 15a98433ae33114b085f3eb3bb03b832b3180a01	path0sym
@@@ -527,7 -547,7 +528,7 @@@ test_expect_success 'writing partial tr
  '
  
  test_expect_success 'validate object ID for a known tree' '
 -	test "$ptree" = "$expectedptree1"
 +	test "$ptree" = 21ae8269cacbe57ae09138dcc3a2887f904d02b3
  '
  
  test_expect_success 'writing partial tree out with git write-tree --prefix' '
@@@ -535,7 -555,7 +536,7 @@@
  '
  
  test_expect_success 'validate object ID for a known tree' '
 -	test "$ptree" = "$expectedptree2"
 +	test "$ptree" = 3c5e5399f3a333eddecce7a9b9465b63f65f51e2
  '
  
  test_expect_success 'put invalid objects into the index' '
@@@ -569,7 -589,7 +570,7 @@@ test_expect_success 'git read-tree foll
  '
  
  test_expect_success 'validate git diff-files output for a know cache/work tree state' '
 -	$expectfilter >expected <<\EOF &&
 +	cat >expected <<\EOF &&
  :100644 100644 f87290f8eb2cbbea7857214459a0739927eab154 0000000000000000000000000000000000000000 M	path0
  :120000 120000 15a98433ae33114b085f3eb3bb03b832b3180a01 0000000000000000000000000000000000000000 M	path0sym
  :100644 100644 3feff949ed00a62d9f7af97c15cd8a30595e7ac7 0000000000000000000000000000000000000000 M	path2/file2
@@@ -593,7 -613,7 +594,7 @@@ test_expect_success 'no diff after chec
  '
  
  ################################################################
 -P=$expectedtree
 +P=087704a96baf1c2d1c869a8b084481e121c88b5b
  
  test_expect_success 'git commit-tree records the correct tree in a commit' '
  	commit0=$(echo NO | git commit-tree $P) &&