diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-28 13:52:19 -0700 |
| commit | e0c74e6f38177dd9bfa7eb2b848530020b251149 (patch) | |
| tree | 440119b55bdaded68337a3cd2427809074fa4097 /t/perf/perf-lib.sh | |
| parent | cd27bc7a0bdb7e62090c503b9e8ab4b4a6bb3d06 (diff) | |
| parent | 28e1fb54665f6f953ba16f75981195f5aa70f59b (diff) | |
| download | git-e0c74e6f38177dd9bfa7eb2b848530020b251149.tar.gz git-e0c74e6f38177dd9bfa7eb2b848530020b251149.tar.xz | |
Merge branch 'jt/perf-updates' into maint
The t/perf performance test suite was not prepared to test not so
old versions of Git, but now it covers versions of Git that are not
so ancient.
* jt/perf-updates:
t/perf: add fallback for pre-bin-wrappers versions of git
t/perf: use $MODERN_GIT for all repo-copying steps
t/perf: export variable used in other blocks
Diffstat (limited to 't/perf/perf-lib.sh')
| -rw-r--r-- | t/perf/perf-lib.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 46f08ee08..ab4b8b06a 100644 --- a/t/perf/perf-lib.sh +++ b/t/perf/perf-lib.sh @@ -83,7 +83,7 @@ test_perf_create_repo_from () { error "bug in the test script: not 2 parameters to test-create-repo" repo="$1" source="$2" - source_git="$(git -C "$source" rev-parse --git-dir)" + source_git="$("$MODERN_GIT" -C "$source" rev-parse --git-dir)" objects_dir="$("$MODERN_GIT" -C "$source" rev-parse --git-path objects)" mkdir -p "$repo/.git" ( @@ -102,7 +102,7 @@ test_perf_create_repo_from () { ) && ( cd "$repo" && - git init -q && { + "$MODERN_GIT" init -q && { test_have_prereq SYMLINKS || git config core.symlinks false } && |