From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 7 Feb 2013 23:16:00 +0000 (-0800)
Subject: Merge branch 'nd/fix-perf-parameters-in-tests' into maint
X-Git-Tag: v1.8.1.3~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5abbeb4921c7dc389f4d1aa4c4d7d67680ada96c?ds=inline;hp=-c

Merge branch 'nd/fix-perf-parameters-in-tests' into maint

* nd/fix-perf-parameters-in-tests:
test-lib.sh: unfilter GIT_PERF_*
---

5abbeb4921c7dc389f4d1aa4c4d7d67680ada96c
diff --combined t/test-lib.sh
index fc42d3a9c4,bf4cf7199c..ea1e4a03a7
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -85,8 -85,7 +85,8 @@@ unset VISUAL EMAIL LANGUAGE COLUMNS $("
  		.*_TEST
  		PROVE
  		VALGRIND
 +		UNZIP
- 		PERF_AGGREGATING_LATER
+ 		PERF_
  	));
  	my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
  	print join("\n", @vars);
@@@ -129,7 -128,6 +129,7 @@@ f
  unset CDPATH
  
  unset GREP_OPTIONS
 +unset UNZIP
  
  case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in
  1|2|true)