From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 May 2019 14:50:34 +0000 (+0900)
Subject: Merge branch 'jk/perf-aggregate-wo-libjson'
X-Git-Tag: v2.22.0-rc0~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6cfa633565cc16f77d6e6d56fa608680828105a1?hp=7a188da354b0dd2525d8534a50e7684efbcf7039

Merge branch 'jk/perf-aggregate-wo-libjson'

The script to aggregate perf result unconditionally depended on
libjson-perl even though it did not have to, which has been
corrected.

* jk/perf-aggregate-wo-libjson:
t/perf: depend on perl JSON only when using --codespeed
---

diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl
index 494907a892..76dd48f890 100755
--- a/t/perf/aggregate.perl
+++ b/t/perf/aggregate.perl
@@ -3,7 +3,6 @@
 use lib '../../perl/build/lib';
 use strict;
 use warnings;
-use JSON;
 use Getopt::Long;
 use Git;
 
@@ -342,7 +341,8 @@ sub print_codespeed_results {
 		}
 	}
 
-	print to_json(\@data, {utf8 => 1, pretty => 1, canonical => 1}), "\n";
+	require JSON;
+	print JSON::to_json(\@data, {utf8 => 1, pretty => 1, canonical => 1}), "\n";
 }
 
 binmode STDOUT, ":utf8" or die "PANIC on binmode: $!";