[08/27] commit: ensure full index

Message ID	a59e45c4ae8f8a1b99e6ddabaec438e281a44057.1615929436.git.gitgitgadget@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <git-owner@kernel.org> Message-Id: <a59e45c4ae8f8a1b99e6ddabaec438e281a44057.1615929436.git.gitgitgadget@gmail.com> In-Reply-To: <pull.906.git.1615929435.gitgitgadget@gmail.com> References: <pull.906.git.1615929435.gitgitgadget@gmail.com> Date: Tue, 16 Mar 2021 21:16:56 +0000 Subject: [PATCH 08/27] commit: 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 <derrickstolee@github.com>, Derrick Stolee <dstolee@microsoft.com> Precedence: bulk From: Derrick Stolee <dstolee@microsoft.com>
Series	Sparse Index: API protections \| expand [00/27] Sparse Index: API protections [01/27] *: remove 'const' qualifier for struct index_state [02/27] read-cache: expand on query into sparse-directory entry [03/27] sparse-index: API protection strategy [04/27] cache: move ensure_full_index() to cache.h [05/27] add: ensure full index [06/27] checkout-index: ensure full index [07/27] checkout: ensure full index [08/27] commit: ensure full index [09/27] difftool: ensure full index [10/27] fsck: ensure full index [11/27] grep: ensure full index [12/27] ls-files: ensure full index [13/27] merge-index: ensure full index [14/27] rm: ensure full index [15/27] sparse-checkout: ensure full index [16/27] update-index: ensure full index [17/27] diff-lib: ensure full index [18/27] dir: ensure full index [19/27] entry: ensure full index [20/27] merge-ort: ensure full index [21/27] merge-recursive: ensure full index [22/27] pathspec: ensure full index [23/27] read-cache: ensure full index [24/27] resolve-undo: ensure full index [25/27] revision: ensure full index [26/27] sparse-index: expand_to_path() [27/27] name-hash: use expand_to_path()

Message ID

a59e45c4ae8f8a1b99e6ddabaec438e281a44057.1615929436.git.gitgitgadget@gmail.com (mailing list archive)

State

Superseded

Headers

Message-Id: 
 <a59e45c4ae8f8a1b99e6ddabaec438e281a44057.1615929436.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.906.git.1615929435.gitgitgadget@gmail.com>
References: <pull.906.git.1615929435.gitgitgadget@gmail.com>
Date: Tue, 16 Mar 2021 21:16:56 +0000
Subject: [PATCH 08/27] commit: 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 <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 March 16, 2021, 9:16 p.m. UTC

From: Derrick Stolee <dstolee@microsoft.com>

These two loops iterate over all cache entries, so ensure that a sparse
index is expanded to a full index before we do so.

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

diff --git a/builtin/commit.c b/builtin/commit.c
index 739110c5a7f6..9ea9e7b53390 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -251,6 +251,7 @@  static int list_paths(struct string_list *list, const char *with_tree,
 		free(max_prefix);
 	}
 
+	ensure_full_index(&the_index);
 	for (i = 0; i < active_nr; i++) {
 		const struct cache_entry *ce = active_cache[i];
 		struct string_list_item *item;
@@ -931,6 +932,7 @@  static int prepare_to_commit(const char *index_file, const char *prefix,
 		if (get_oid(parent, &oid)) {
 			int i, ita_nr = 0;
 
+			ensure_full_index(&the_index);
 			for (i = 0; i < active_nr; i++)
 				if (ce_intent_to_add(active_cache[i]))
 					ita_nr++;

[08/27] commit: ensure full index

Commit Message

Patch