Johannes Schindelin <johannes.schinde...@gmx.de> writes:
>> This breaks perf for the non-worktree case:
>
> Oh drats!
>
>> lsr@debian:~/src/git/t/perf$ make
>> rm -rf test-results
>> ./run
>> === Running 12 tests in this tree ===
>> cp: cannot stat '.git/objects': No such file or directory
>> error: failed to copy repository '/home/lsr/src/git/t/..' to '/tmp/trash
>> directory.p0000-perf-lib-sanity'
>> cp: cannot stat '.git/objects': No such file or directory
>> error: failed to copy repository '/home/lsr/src/git/t/..' to '/tmp/trash
>> directory.p0001-rev-list'
>> ...
>>
>> Here's a fix:
>>
>> -- >8 --
>> 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 <l....@web.de>
>> ---
>> t/perf/perf-lib.sh | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
>> index 5ef1744..1888790 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" &&
>
> I fear that interacts badly with the `cd "$repo"` I introduced later
> (replacing a `cd ..`)...
What do you want to do then? For now before -rc1 we can revert the
whole thing so that we can get a tested thing that works in both
layouts.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
