Re: [PATCH v3 02/13] unpack-trees: heed requests to overwrite ignored files

From: Jonathan Tan <jonathantanmy@google.com>
Date: Feb 27, 2023, 23:20 UTC
Message-ID: <20230227232047.2441760-1-jonathantanmy@google.com>
In-Reply-To: <8ffdb6c8a8a3b162c898ba759137d41bbfd44b39.1677511700.git.gitgitgadget@gmail.com>

"Elijah Newren via GitGitGadget" <gitgitgadget@gmail.com> writes:

Show 13 quoted lines

> diff --git a/unpack-trees.c b/unpack-trees.c
> index 3d05e45a279..4518d33ed99 100644
> --- a/unpack-trees.c
> +++ b/unpack-trees.c
> @@ -2337,7 +2337,7 @@ static int verify_clean_subdirectory(const struct cache_entry *ce,
>  
>  	memset(&d, 0, sizeof(d));
>  	if (o->dir)
> -		d.exclude_per_dir = o->dir->exclude_per_dir;
> +		setup_standard_excludes(&d);
>  	i = read_directory(&d, o->src_index, pathbuf, namelen+1, NULL);
>  	dir_clear(&d);
>  	free(pathbuf);

Thanks to the later patches in this patch set, I only needed to look at unpack-trees.c to see how o->dir (later, o->internal.dir) is set. The only place it is set is in unpack_trees(), in which a flag is set and setup_standard_excludes() is called. So the RHS of the diff here does effectively the same thing as the LHS. (As for the flag, it is not set in the RHS, but it was not set in the LHS in the first place, so that's fine.)

Thanks - all 13 patches in this patch set look good.