Re: [PATCH 17/27] diff-lib: ensure full index
- From
Elijah Newren <newren@gmail.com>
- Date
- Mar 18, 2021, 05:24 UTC
- Message-ID
- <CABPp-BHsSpQieOGFPwXJ63qy1JhWcwu-bSvv1w7-yTZ6T4fx9Q@mail.gmail.com>
- In-Reply-To
- <45bbed6150a2a9f9e9446edc9a613f027da73957.1615929436.git.gitgitgadget@gmail.com>
On Tue, Mar 16, 2021 at 2:17 PM Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com> wrote:
Show 23 quoted lines
>
> From: Derrick Stolee <dstolee@microsoft.com>
>
> Before iterating over all cache entries, ensure that a sparse index is
> expanded to a full index to avoid unexpected behavior.
>
> Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
> ---
> diff-lib.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/diff-lib.c b/diff-lib.c
> index b73cc1859a49..41d6fcec1a81 100644
> --- a/diff-lib.c
> +++ b/diff-lib.c
> @@ -102,6 +102,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
>
> if (diff_unmerged_stage < 0)
> diff_unmerged_stage = 2;
> +
> entries = istate->cache_nr;
> for (i = 0; i < entries; i++) {
> unsigned int oldmode, newmode;I don't think adding a blank newline will ensure the index is expanded. ;-)