[v2,17/25] dir: ensure full index

Message ID	fae4c078c3ef8f65dc6673969642a3b35a254ba6.1617241803.git.gitgitgadget@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> Message-Id: <fae4c078c3ef8f65dc6673969642a3b35a254ba6.1617241803.git.gitgitgadget@gmail.com> In-Reply-To: <pull.906.v2.git.1617241802.gitgitgadget@gmail.com> References: <pull.906.git.1615929435.gitgitgadget@gmail.com> <pull.906.v2.git.1617241802.gitgitgadget@gmail.com> Date: Thu, 01 Apr 2021 01:49:54 +0000 Subject: [PATCH v2 17/25] dir: 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 [v2,00/25] Sparse Index: API protections [v2,01/25] sparse-index: API protection strategy [v2,02/25] *: remove 'const' qualifier for struct index_state [v2,03/25] read-cache: expand on query into sparse-directory entry [v2,04/25] cache: move ensure_full_index() to cache.h [v2,05/25] add: ensure full index [v2,06/25] checkout-index: ensure full index [v2,07/25] checkout: ensure full index [v2,08/25] commit: ensure full index [v2,09/25] difftool: ensure full index [v2,10/25] fsck: ensure full index [v2,11/25] grep: ensure full index [v2,12/25] ls-files: ensure full index [v2,13/25] merge-index: ensure full index [v2,14/25] rm: ensure full index [v2,15/25] stash: ensure full index [v2,16/25] update-index: ensure full index [v2,17/25] dir: ensure full index [v2,18/25] entry: ensure full index [v2,19/25] merge-recursive: ensure full index [v2,20/25] pathspec: ensure full index [v2,21/25] read-cache: ensure full index [v2,22/25] resolve-undo: ensure full index [v2,23/25] revision: ensure full index [v2,24/25] sparse-index: expand_to_path() [v2,25/25] name-hash: use expand_to_path()

Message ID

fae4c078c3ef8f65dc6673969642a3b35a254ba6.1617241803.git.gitgitgadget@gmail.com (mailing list archive)

State

New, archived

Headers

Message-Id: 
 <fae4c078c3ef8f65dc6673969642a3b35a254ba6.1617241803.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.906.v2.git.1617241802.gitgitgadget@gmail.com>
References: <pull.906.git.1615929435.gitgitgadget@gmail.com>
        <pull.906.v2.git.1617241802.gitgitgadget@gmail.com>
Date: Thu, 01 Apr 2021 01:49:54 +0000
Subject: [PATCH v2 17/25] dir: 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 1, 2021, 1:49 a.m. UTC

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>
---
 dir.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dir.c b/dir.c
index 5b00dfb5b144..166238e79f52 100644
--- a/dir.c
+++ b/dir.c
@@ -3533,6 +3533,8 @@  static void connect_wt_gitdir_in_nested(const char *sub_worktree,
 	if (repo_read_index(&subrepo) < 0)
 		die(_("index file corrupt in repo %s"), subrepo.gitdir);
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(subrepo.index);
 	for (i = 0; i < subrepo.index->cache_nr; i++) {
 		const struct cache_entry *ce = subrepo.index->cache[i];

[v2,17/25] dir: ensure full index

Commit Message

Patch