[v3,09/26] difftool: ensure full index

Message ID	8c61d40dfe01d89d248ff9208e955801c1a18c18.1618261698.git.gitgitgadget@gmail.com (mailing list archive)
State	Accepted
Commit	48b3c7da6c58752b0fbc73e891fd5b24c95281b1
Headers	show Return-Path: <git-owner@kernel.org> Message-Id: <8c61d40dfe01d89d248ff9208e955801c1a18c18.1618261698.git.gitgitgadget@gmail.com> In-Reply-To: <pull.906.v3.git.1618261697.gitgitgadget@gmail.com> References: <pull.906.v2.git.1617241802.gitgitgadget@gmail.com> <pull.906.v3.git.1618261697.gitgitgadget@gmail.com> Date: Mon, 12 Apr 2021 21:08:00 +0000 Subject: [PATCH v3 09/26] difftool: ensure full index Fcc: Sent Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MIME-Version: 1.0 To: git@vger.kernel.org Cc: newren@gmail.com, gitster@pobox.com, Derrick Stolee <stolee@gmail.com>, Matheus Tavares Bernardino <matheus.bernardino@usp.br>, Derrick Stolee <derrickstolee@github.com>, Derrick Stolee <dstolee@microsoft.com> Precedence: bulk From: Derrick Stolee <dstolee@microsoft.com>
Series	Sparse Index: API protections \| expand [v3,00/26] Sparse Index: API protections [v3,01/26] sparse-index: API protection strategy [v3,02/26] *: remove 'const' qualifier for struct index_state [v3,03/26] read-cache: expand on query into sparse-directory entry [v3,04/26] cache: move ensure_full_index() to cache.h [v3,05/26] add: ensure full index [v3,06/26] checkout-index: ensure full index [v3,07/26] checkout: ensure full index [v3,08/26] commit: ensure full index [v3,09/26] difftool: ensure full index [v3,10/26] fsck: ensure full index [v3,11/26] grep: ensure full index [v3,12/26] ls-files: ensure full index [v3,13/26] merge-index: ensure full index [v3,14/26] rm: ensure full index [v3,15/26] stash: ensure full index [v3,16/26] update-index: ensure full index [v3,17/26] dir: ensure full index [v3,18/26] entry: ensure full index [v3,19/26] merge-recursive: ensure full index [v3,20/26] pathspec: ensure full index [v3,21/26] read-cache: ensure full index [v3,22/26] resolve-undo: ensure full index [v3,23/26] revision: ensure full index [v3,24/26] name-hash: don't add directories to name_hash [v3,25/26] sparse-index: expand_to_path() [v3,26/26] name-hash: use expand_to_path()

Message ID

8c61d40dfe01d89d248ff9208e955801c1a18c18.1618261698.git.gitgitgadget@gmail.com (mailing list archive)

State

Accepted

Commit

48b3c7da6c58752b0fbc73e891fd5b24c95281b1

Headers

Message-Id: 
 <8c61d40dfe01d89d248ff9208e955801c1a18c18.1618261698.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.906.v3.git.1618261697.gitgitgadget@gmail.com>
References: <pull.906.v2.git.1617241802.gitgitgadget@gmail.com>
        <pull.906.v3.git.1618261697.gitgitgadget@gmail.com>
Date: Mon, 12 Apr 2021 21:08:00 +0000
Subject: [PATCH v3 09/26] difftool: ensure full index
Fcc: Sent
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
To: git@vger.kernel.org
Cc: newren@gmail.com, gitster@pobox.com,
        Derrick Stolee <stolee@gmail.com>,
        Matheus Tavares Bernardino <matheus.bernardino@usp.br>,
        Derrick Stolee <derrickstolee@github.com>,
        Derrick Stolee <dstolee@microsoft.com>
Precedence: bulk
From: Derrick Stolee <dstolee@microsoft.com>

Series

Sparse Index: API protections | expand

Commit Message

Derrick Stolee April 12, 2021, 9:08 p.m. UTC

From: Derrick Stolee <dstolee@microsoft.com>

Before iterating over all cache entries, ensure that a sparse index has
been expanded to a full one to avoid unexpected behavior.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
 builtin/difftool.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 6e18e623fddf..32c914dde6a0 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -584,6 +584,9 @@  static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 		setenv("GIT_DIFFTOOL_DIRDIFF", "true", 1);
 	rc = run_command_v_opt(helper_argv, flags);
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(&wtindex);
+
 	/*
 	 * If the diff includes working copy files and those
 	 * files were modified during the diff, then the changes

[v3,09/26] difftool: ensure full index

Commit Message

Patch