Re: [PATCH 1/4] checkout: fix nested sparse directory diff in sparse index

From: Derrick Stolee <derrickstolee@github.com>
Date: Aug 5, 2022, 17:59 UTC
Message-ID: <c93dc6d7-ab49-667f-ef4e-544a764fb737@github.com>
In-Reply-To: <255318f4dc61daef3e892a4dd5c571463985f340.1659645967.git.gitgitgadget@gmail.com>

On 8/4/2022 4:46 PM, Victoria Dye via GitGitGadget wrote:

Show 7 quoted lines

> From: Victoria Dye <vdye@github.com>
> 
> Add the 'recursive' diff flag to the local changes reporting done by 'git
> checkout' in 'show_local_changes()'. Without the flag enabled, unexpanded
> sparse directories will not be recursed into to report the diff of each
> file's contents, resulting in the reported local changes including
> "modified" sparse directories.

Nice find!

> +	rev.diffopt.flags.recursive = 1;

Simple fix.

Show 7 quoted lines

> +test_expect_success 'checkout with modified sparse directory' '
> +	init_repos &&
> +
> +	test_all_match git checkout rename-in-to-out -- . &&
> +	test_sparse_match git sparse-checkout reapply &&
> +	test_all_match git checkout base
> +'

Simple test.

Excellent. -Stolee