Merge branch 'jk/perf-any-version'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2016 17:31:06 +0000 (10:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 Jul 2016 17:31:06 +0000 (10:31 -0700)
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

1  2 
t/perf/perf-lib.sh
index 773f955d4a251e768b8bc39f7e05161936fda1f5,6520c76a1773e86a6e056bd35a3eb677f613a05e..46f08ee0870ffd2b1e0eb7d159b159d25ef61ffb
@@@ -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