Merge pull request microsoft#444 from vdye/reset-upstream-changes

Sparse Index: upstream updates to `git reset`
ldennington · Jan 20, 2022 · 3c8102f · 3c8102f
2 parents c29e007 + 0bd23f8
commit 3c8102f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/read-cache.c b/read-cache.c
@@ -2411,7 +2411,8 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
 	 * settings and other properties of the index (if necessary).
 	 */
 	prepare_repo_settings(istate->repo);
-	if (istate->repo->settings.command_requires_full_index)
+	if (!istate->repo->settings.sparse_index ||
+	    istate->repo->settings.command_requires_full_index)
 		ensure_full_index(istate);
 	else
 		ensure_correct_sparsity(istate);