diff options
| author | Victoria Dye <vdye@github.com> | 2022-01-11 18:05:05 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-13 13:49:45 -0800 |
| commit | c35e9f5ecd00f0c003dc9120d3c68e95e2ba3bd7 (patch) | |
| tree | fa30893d645bb25b851734d85d6823893eb36b89 /builtin/update-index.c | |
| parent | e015d4d9614f728cc454900fde52af2076d5ef63 (diff) | |
| download | git-c35e9f5ecd00f0c003dc9120d3c68e95e2ba3bd7.tar.gz | |
update-index: integrate with sparse index
Enable use of the sparse index with `update-index`. Most variations of
`update-index` work without explicitly expanding the index or making any
other updates in or outside of `update-index.c`.
The one usage requiring additional changes is `--cacheinfo`; if a file
inside a sparse directory was specified, the index would not be expanded
until after the cache tree is invalidated, leading to a mismatch between the
index and cache tree. This scenario is handled by rearranging
`add_index_entry_with_check`, allowing `index_name_stage_pos` to expand the
index *before* attempting to invalidate the relevant cache tree path,
avoiding cache tree/index corruption.
Signed-off-by: Victoria Dye <vdye@github.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/update-index.c')
| -rw-r--r-- | builtin/update-index.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c index 187203e8bb..605cc693bb 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -1077,6 +1077,9 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) git_config(git_default_config, NULL); + prepare_repo_settings(r); + the_repository->settings.command_requires_full_index = 0; + /* we will diagnose later if it turns out that we need to update it */ newfd = hold_locked_index(&lock_file, 0); if (newfd < 0) |