summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-03 21:38:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-06-03 21:38:00 (GMT)
commitbe3ac81f0c73252b7df34522e4886c4427eb43ae (patch)
treefc01d855d7fe9465177df7543982656dfab0bbb4
parent60bd4b1c513bb652cdffad44382046ca872140eb (diff)
parente2522f2acaec35130520f76c36c711b2011ed310 (diff)
downloadgit-be3ac81f0c73252b7df34522e4886c4427eb43ae.zip
git-be3ac81f0c73252b7df34522e4886c4427eb43ae.tar.gz
git-be3ac81f0c73252b7df34522e4886c4427eb43ae.tar.bz2
Merge branch 'js/perf-rebase-i'
The one in 'master' has a brown-paper-bag bug that breaks the perf test when used inside a usual Git repository with a working tree. * js/perf-rebase-i: perf: make the tests work without a worktree
-rw-r--r--t/perf/perf-lib.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index 5ef1744..18c363e 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -84,6 +84,7 @@ test_perf_create_repo_from () {
objects_dir="$(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
@@ -94,7 +95,9 @@ test_perf_create_repo_from () {
cp -R "$stuff" "$repo/.git/" || exit 1
;;
esac
- done &&
+ done
+ ) &&
+ (
cd "$repo" &&
git init -q && {
test_have_prereq SYMLINKS ||