From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 19 May 2019 07:45:28 +0000 (+0900)
Subject: Merge branch 'ab/perf-installed-fix'
X-Git-Tag: v2.22.0-rc1~29
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/82dca958dd8c3eba22653c605710c3ef6514958f

Merge branch 'ab/perf-installed-fix'

Performance test framework has been broken and measured the version
of Git that happens to be on $PATH, not the specified one to
measure, for a while, which has been corrected.

* ab/perf-installed-fix:
perf-lib.sh: forbid the use of GIT_TEST_INSTALLED
perf tests: add "bindir" prefix to git tree test results
perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.sh
perf-lib.sh: make "./run <revisions>" use the correct gits
perf aggregate: remove GIT_TEST_INSTALLED from --codespeed
perf README: correct docs for 3c8f12c96c regression
---

82dca958dd8c3eba22653c605710c3ef6514958f
diff --cc t/perf/aggregate.perl
index 76dd48f890,b951747e08..66554d2161
--- a/t/perf/aggregate.perl
+++ b/t/perf/aggregate.perl
@@@ -3,8 -3,10 +3,9 @@@
  use lib '../../perl/build/lib';
  use strict;
  use warnings;
 -use JSON;
  use Getopt::Long;
  use Git;
+ use Cwd qw(realpath);
  
  sub get_times {
  	my $name = shift;