From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Feb 2024 23:11:19 GMT
Subject: Re: [PATCH 4/7] t1404: make D/F conflict tests compatible with reftable backend
Message-ID: <xmqqbk8itze0.fsf@gitster.g>
In-Reply-To: <70c6f980126aabb2ade336861e816cf1fe6e9110.1707463221.git.ps@pks.im>

Patrick Steinhardt <ps@pks.im> writes:

>  	test_must_fail git update-ref --stdin <commands 2>output.err &&
> -	test_cmp expected-err output.err &&
> +	grep "fatal:\( cannot lock ref $SQ$addname$SQ:\)\? $SQ$delref$SQ exists; cannot create $SQ$addref$SQ" output.err &&

OK, that's more thorough than I would have done (I am lazy and would
just check "cannot create"), but being more specific is better than
being lazy ;-)

> @@ -191,69 +188,69 @@ test_expect_success 'one new ref is a simple prefix of another' '
>  
>  '
>  
> -test_expect_success REFFILES 'D/F conflict prevents add long + delete short' '
> +test_expect_success 'D/F conflict prevents add long + delete short' '
>  	df_test refs/df-al-ds --add-del foo/bar foo
>  '

All the changes make sense here.  Thanks.