From e2522f2acaec35130520f76c36c711b2011ed310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Scharfe?= Date: Sun, 29 May 2016 18:43:41 +0200 Subject: perf: make the tests work without a worktree In regular repositories $source_git and $objects_dir contain relative paths based on $source. Go there to allow cp to resolve them. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano --- t/perf/perf-lib.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 't/perf') diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh index 5ef17440c..18c363ea7 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 || -- cgit v1.2.1