diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2021-04-01 01:49:44 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-04-14 13:47:03 -0700 |
| commit | 0f6d3ba6bd795b09bf216c267bbf6e3ec2409d1e (patch) | |
| tree | 172e195f87d3339e178be372ade84adac4c70500 | |
| parent | checkout-index: ensure full index (diff) | |
| download | tgif-0f6d3ba6bd795b09bf216c267bbf6e3ec2409d1e.tar.xz | |
checkout: ensure full index
Before iterating over all cache entries in the checkout builtin, ensure
that we have a full index to avoid any unexpected behavior.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/checkout.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 0e66390520..d0dbe63ea1 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -368,6 +368,9 @@ static int checkout_worktree(const struct checkout_opts *opts, NULL); enable_delayed_checkout(&state); + + /* TODO: audit for interaction with sparse-index. */ + ensure_full_index(&the_index); for (pos = 0; pos < active_nr; pos++) { struct cache_entry *ce = active_cache[pos]; if (ce->ce_flags & CE_MATCHED) { @@ -512,6 +515,8 @@ static int checkout_paths(const struct checkout_opts *opts, * Make sure all pathspecs participated in locating the paths * to be checked out. */ + /* TODO: audit for interaction with sparse-index. */ + ensure_full_index(&the_index); for (pos = 0; pos < active_nr; pos++) if (opts->overlay_mode) mark_ce_for_checkout_overlay(active_cache[pos], |