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 /resolve-undo.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 'resolve-undo.c')
| -rw-r--r-- | resolve-undo.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/resolve-undo.c b/resolve-undo.c index bbd2e57..e81096e 100644 --- a/resolve-undo.c +++ b/resolve-undo.c @@ -172,6 +172,8 @@ void unmerge_marked_index(struct index_state *istate) if (!istate->resolve_undo) return; + /* TODO: audit for interaction with sparse-index. */ + ensure_full_index(istate); for (i = 0; i < istate->cache_nr; i++) { const struct cache_entry *ce = istate->cache[i]; if (ce->ce_flags & CE_MATCHED) @@ -186,6 +188,8 @@ void unmerge_index(struct index_state *istate, const struct pathspec *pathspec) if (!istate->resolve_undo) return; + /* TODO: audit for interaction with sparse-index. */ + ensure_full_index(istate); for (i = 0; i < istate->cache_nr; i++) { const struct cache_entry *ce = istate->cache[i]; if (!ce_path_match(istate, ce, pathspec, NULL)) |