From: Phillip Wood <phillip.wood123@gmail.com>
Date: Mon, 18 Oct 2021 09:37:23 GMT
Subject: Re: [PATCH v4] sparse index: fix use-after-free bug in cache_tree_verify()
Message-ID: <3d0ff15e-469d-c659-4b32-295c7645bb8d@gmail.com>
In-Reply-To: <xmqqilxw1a9v.fsf@gitster.g>

Hi Junio

On 17/10/2021 06:38, Junio C Hamano wrote:
> "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com> writes:
> 
>>      [RFC] sparse index: fix use-after-free bug in cache_tree_verify()
>>      
>>      Changes since V3
>>      
>>       * removed "-q" from the test [1]. This is the same as V2 with a typo
>>         fixed in the commit message
>>      
>>      [1] https://lore.kernel.org/git/
>>      e281c2e2-2044-1a11-e2bc-5ab3ee92c300@gmail.com/
> 
> Thanks.  Unfortunately I've already merged the previosu version on
> the 11th,

Oh sorry I'd missed that

  so I took the liberty of turning this round into an
> incremental.  How does this look?
It looks fine to me with Stolee's typo fixes

Thanks

Phillip

> ----- >8 --------- >8 --------- >8 --------- >8 -----
> From: Phillip Wood <phillip.wood@dunelm.org.uk>
> Date: Sat, 16 Oct 2021 09:07:09 +0000
> Subject: [PATCH] t1092: run "rebase --apply" without "-q" in the test
> 
> We run a few Git subcommands and make sure they produce identical
> results with and without sparse-index.  To this set of subcommands,
> an earlier commit added "rebase --apply", but did so with the "-q"
> option, in order to work around a breakge caused by a version used
> at Microsoft with some unreleased changes.
> 
> Because we would want to make sure the commands produce indentical
> results, including reports given to the output that lists which
> commits were picked, use of "-q" loses too much interesting
> information.  Let's drop "-q" from the command invocation and
> revisit the issue when the problematic changes are upstreamed.
> 
> Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> Helped-by: Derrick Stolee <dstolee@microsoft.com>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>   t/t1092-sparse-checkout-compatibility.sh | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
> index 80c77bb432..85d5279b33 100755
> --- a/t/t1092-sparse-checkout-compatibility.sh
> +++ b/t/t1092-sparse-checkout-compatibility.sh
> @@ -484,7 +484,7 @@ test_expect_success 'checkout and reset (mixed) [sparse]' '
>   test_expect_success 'merge, cherry-pick, and rebase' '
>   	init_repos &&
>   
> -	for OPERATION in "merge -m merge" cherry-pick "rebase --apply -q" "rebase --merge"
> +	for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"
>   	do
>   		test_all_match git checkout -B temp update-deep &&
>   		test_all_match git $OPERATION update-folder1 &&
>