diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-17 16:25:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-17 16:25:05 -0800 |
| commit | 2f45f3e2bc859e5d5d29ede28de14f073c2dc227 (patch) | |
| tree | 5ee746acec3fe482534dbb4c7c8b21c251b47115 /builtin/clean.c | |
| parent | 708cbef33a2c905c920e94b70d0946f9f4ff3a4e (diff) | |
| parent | b9ca5e26579ceb820103b49648c01187a4a0dddd (diff) | |
Merge branch 'vd/sparse-clean-etc'
"git update-index", "git checkout-index", and "git clean" are
taught to work better with the sparse checkout feature.
* vd/sparse-clean-etc:
update-index: reduce scope of index expansion in do_reupdate
update-index: integrate with sparse index
update-index: add tests for sparse-checkout compatibility
checkout-index: integrate with sparse index
checkout-index: add --ignore-skip-worktree-bits option
checkout-index: expand sparse checkout compatibility tests
clean: integrate with sparse index
reset: reorder wildcard pathspec conditions
reset: fix validation in sparse index test
Diffstat (limited to 'builtin/clean.c')
| -rw-r--r-- | builtin/clean.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/clean.c b/builtin/clean.c index 3ff02bbbff..5466636e66 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -1009,6 +1009,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix) dir.flags |= DIR_KEEP_UNTRACKED_CONTENTS; } + prepare_repo_settings(the_repository); + the_repository->settings.command_requires_full_index = 0; + if (read_cache() < 0) die(_("index file corrupt")); |