sparse-checkout: --no-sparse-index needs a full index

When the --no-sparse-index option is supplied, the sparse-checkout
builtin should explicitly ask to expand a sparse index to a full one.
This is currently done implicitly due to the command_requires_full_index
protection, but that will be removed in an upcoming change.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
index 5b054400bf321532cb17296f372a9be1e289a25a..1db51c3fd72da7bd90df9443847bdb38912ffa88 100644 (file)
--- a/builtin/sparse-checkout.c
+++ b/builtin/sparse-checkout.c
@@ -413,6 +413,9 @@ static int update_modes(int *cone_mode, int *sparse_index)
                /* force an index rewrite */
                repo_read_index(the_repository);
                the_repository->index->updated_workdir = 1;
+
+               if (!*sparse_index)
+                       ensure_full_index(the_repository->index);
        }
 
        return 0;