diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-04-30 04:50:26 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-04-30 04:50:26 (GMT) |
commit | 8e97852919fa422bc5fe57bc7e71826cf2b5224d (patch) | |
tree | 9a19699763f51c205f04fe05f67282c1cccde28b /repository.c | |
parent | d250f903596ee149dffcd65e3794dbd00b62f97e (diff) | |
parent | 4589bca829a2ace58bc98876cccd7dbd2e89f732 (diff) | |
download | git-8e97852919fa422bc5fe57bc7e71826cf2b5224d.zip git-8e97852919fa422bc5fe57bc7e71826cf2b5224d.tar.gz git-8e97852919fa422bc5fe57bc7e71826cf2b5224d.tar.bz2 |
Merge branch 'ds/sparse-index-protections'
Builds on top of the sparse-index infrastructure to mark operations
that are not ready to mark with the sparse index, causing them to
fall back on fully-populated index that they always have worked with.
* ds/sparse-index-protections: (47 commits)
name-hash: use expand_to_path()
sparse-index: expand_to_path()
name-hash: don't add directories to name_hash
revision: ensure full index
resolve-undo: ensure full index
read-cache: ensure full index
pathspec: ensure full index
merge-recursive: ensure full index
entry: ensure full index
dir: ensure full index
update-index: ensure full index
stash: ensure full index
rm: ensure full index
merge-index: ensure full index
ls-files: ensure full index
grep: ensure full index
fsck: ensure full index
difftool: ensure full index
commit: ensure full index
checkout: ensure full index
...
Diffstat (limited to 'repository.c')
-rw-r--r-- | repository.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/repository.c b/repository.c index 87b355e..448cd55 100644 --- a/repository.c +++ b/repository.c @@ -10,6 +10,7 @@ #include "object.h" #include "lockfile.h" #include "submodule-config.h" +#include "sparse-index.h" /* The main repository */ static struct repository the_repo; @@ -261,6 +262,8 @@ void repo_clear(struct repository *repo) int repo_read_index(struct repository *repo) { + int res; + if (!repo->index) CALLOC_ARRAY(repo->index, 1); @@ -270,7 +273,13 @@ int repo_read_index(struct repository *repo) else if (repo->index->repo != repo) BUG("repo's index should point back at itself"); - return read_index_from(repo->index, repo->index_file, repo->gitdir); + res = read_index_from(repo->index, repo->index_file, repo->gitdir); + + prepare_repo_settings(repo); + if (repo->settings.command_requires_full_index) + ensure_full_index(repo->index); + + return res; } int repo_hold_locked_index(struct repository *repo, |