Skip to content

Commit be3ac81

Browse files
committed
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
2 parents 60bd4b1 + e2522f2 commit be3ac81

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

t/perf/perf-lib.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ test_perf_create_repo_from () {
8484
objects_dir="$(git -C "$source" rev-parse --git-path objects)"
8585
mkdir -p "$repo/.git"
8686
(
87+
cd "$source" &&
8788
{ cp -Rl "$objects_dir" "$repo/.git/" 2>/dev/null ||
8889
cp -R "$objects_dir" "$repo/.git/"; } &&
8990
for stuff in "$source_git"/*; do
@@ -94,7 +95,9 @@ test_perf_create_repo_from () {
9495
cp -R "$stuff" "$repo/.git/" || exit 1
9596
;;
9697
esac
97-
done &&
98+
done
99+
) &&
100+
(
98101
cd "$repo" &&
99102
git init -q && {
100103
test_have_prereq SYMLINKS ||

0 commit comments

Comments
 (0)