From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Jul 2016 17:31:06 +0000 (-0700)
Subject: Merge branch 'jk/perf-any-version'
X-Git-Tag: v2.10.0-rc0~138
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9a6d713316d2e774d8005b8594a4fad75d7652d;p=thirdparty%2Fgit.git

Merge branch 'jk/perf-any-version'

Allow t/perf framework to use the features from the most recent
version of Git even when testing an older installed version.

* jk/perf-any-version:
  p4211: explicitly disable renames in no-rename test
  t/perf: fix regression in testing older versions of git
---

e9a6d713316d2e774d8005b8594a4fad75d7652d
diff --cc t/perf/perf-lib.sh
index 773f955d4a,6520c76a17..46f08ee087
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@@ -81,10 -84,9 +84,10 @@@ test_perf_create_repo_from () 
  	repo="$1"
  	source="$2"
  	source_git="$(git -C "$source" rev-parse --git-dir)"
- 	objects_dir="$(git -C "$source" rev-parse --git-path objects)"
+ 	objects_dir="$("$MODERN_GIT" -C "$source" rev-parse --git-path objects)"
  	mkdir -p "$repo/.git"
  	(
 +		cd "$source" &&
  		{ cp -Rl "$objects_dir" "$repo/.git/" 2>/dev/null ||
  			cp -R "$objects_dir" "$repo/.git/"; } &&
  		for stuff in "$source_git"/*; do