diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-04-30 07:50:26 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-04-30 07:50:26 +0300 |
commit | 8e97852919fa422bc5fe57bc7e71826cf2b5224d (patch) | |
tree | 9a19699763f51c205f04fe05f67282c1cccde28b /builtin/grep.c | |
parent | d250f903596ee149dffcd65e3794dbd00b62f97e (diff) | |
parent | 4589bca829a2ace58bc98876cccd7dbd2e89f732 (diff) |
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 'builtin/grep.c')
-rw-r--r-- | builtin/grep.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/grep.c b/builtin/grep.c index 5de725f904..b71b4a2de6 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -504,6 +504,8 @@ static int grep_cache(struct grep_opt *opt, if (repo_read_index(repo) < 0) die(_("index file corrupt")); + /* TODO: audit for interaction with sparse-index. */ + ensure_full_index(repo->index); for (nr = 0; nr < repo->index->cache_nr; nr++) { const struct cache_entry *ce = repo->index->cache[nr]; |