From: Glen Choo <chooglen@google.com>
Date: Thu, 15 Dec 2022 21:05:50 GMT
Subject: Re: [PATCH v4 4/9] submodule--helper: don't use global --super-prefix in "absorbgitdirs"
Message-ID: <kl6l359ge5sh.fsf@chooglen-macbookpro.roam.corp.google.com>
In-Reply-To: <patch-v4-4.9-bde9038c4e3-20221215T083502Z-avarab@gmail.com>

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

>                            Let's instead assert the full output that
> we *do* have, which we can do here as this is based on a change[4] to
> make it predictable (until [4] it contained absolute paths).
> ...
> 4. https://lore.kernel.org/git/patch-1.1-34b54fdd9bb-20221109T020347Z-avarab@gmail.com/

This sentence is stale now, since the test uses absolute paths.

> @@ -904,10 +886,20 @@ test_expect_success "stray submodule super-prefix warning" '
>  
>  	test_path_is_dir super/dir_1/dir_2/sub/.git &&
>  
> +	cwd="$(cd super && pwd)" &&
> +	cat >expect <<-EOF &&
> +	Migrating git directory of '\''dir_1/dir_2/sub'\'' from
> +	'\''$cwd/dir_1/dir_2/sub/.git'\'' to
> +	'\''$cwd/.git/modules/dir_1/dir_2/sub'\''
> +	EOF

Namely, this test uses absolute paths.

>  	GIT_TRACE2_EVENT="$PWD/super-sub.trace" \
> -		git -C super submodule absorbgitdirs &&
> +		git -C super submodule absorbgitdirs >out 2>actual &&
> +	test_cmp expect actual &&
> +	test_must_be_empty out &&
>  
> -	! have_t2_error_event super-sub.trace
> +	# Confirm that the trace2 log contains a record of the
> +	# daemon starting.
> +	test_subcommand git fsmonitor--daemon start <super-sub.trace
>  '
>  
>  # On a case-insensitive file system, confirm that the daemon
> -- 
> 2.39.0.rc2.1048.g0e5493b8d5b