Re: [PATCH] t/perf: handle worktrees as test repos

From: Derrick Stolee <stolee@gmail.com>
Date: Feb 16, 2021, 20:36 UTC
Message-ID: <22378ce3-6845-1cd9-996a-8bdc3a8b65d7@gmail.com>
In-Reply-To: <YCwoOMo7obrNOGYX@coredump.intra.peff.net>

On 2/16/2021 3:16 PM, Jeff King wrote:

Show 9 quoted lines

> On Tue, Feb 16, 2021 at 03:12:45PM -0500, Jeff King wrote:
> 
>> Having written that, it occurs to me that an even simpler solution is to
>> just always use the commondir as the source of the scratch repo. It does
>> not produce the same outcome, but the point is generally just to find a
>> suitable starting point for a repository. Grabbing the main repo instead
>> of one of its worktrees is probably OK for most tests.
> 
> The patch there is delightfully simple:

I do like this simplicity.

Show 15 quoted lines

> diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
> index e385c6896f..7018256cd4 100644
> --- a/t/perf/perf-lib.sh
> +++ b/t/perf/perf-lib.sh
> @@ -75,7 +75,7 @@ test_perf_create_repo_from () {
>  	BUG "not 2 parameters to test-create-repo"
>  	repo="$1"
>  	source="$2"
> -	source_git="$("$MODERN_GIT" -C "$source" rev-parse --git-dir)"
> +	source_git="$("$MODERN_GIT" -C "$source" rev-parse --git-common-dir)"
>  	objects_dir="$("$MODERN_GIT" -C "$source" rev-parse --git-path objects)"
>  	mkdir -p "$repo/.git"
>  	(
> 
> but I do wonder if somebody would find it confusing.

It would be confusing, especially if one let the "main" worktree languish far behind another worktree. Rather, one case that applies mostly to me and my team is when we work on git-for-windows/git or microsoft/git in a worktree off of git/git. I think it would be appropriate to use either, as the differences at HEAD are not so significant to matter. But, any deviation from the HEAD of the current worktree might be confusing when trying to reproduce some surprising behavior.

Thanks, -Stolee