Re: [PATCH v2] sparse index: fix use-after-free bug in cache_tree_verify()

From: Derrick Stolee <stolee@gmail.com>
Date: Oct 7, 2021, 13:53 UTC
Message-ID: <3bf4e767-294e-0f30-f0bc-ffa706a86835@gmail.com>
In-Reply-To: <pull.1053.v2.git.1633600244854.gitgitgadget@gmail.com>

On 10/7/2021 5:50 AM, Phillip Wood via GitGitGadget wrote:

> From: Phillip Wood <phillip.wood@dunelm.org.uk>

...

Show 10 quoted lines

> diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
> index 886e78715fe..85d5279b33c 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
> +	for OPERATION in "merge -m merge" cherry-pick "rebase --apply" "rebase --merge"

I spoke too soon. On my machine, the 'git rebase --apply' tests fail because of some verbose output that does not match across the full and sparse cases. Using "rebase -q --apply" works for me.

Thanks, -Stolee