diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-10 11:52:50 -0800 |
| commit | 3c0e4178277dee1cdc4607d7277a368379b12b3f (patch) | |
| tree | ad35aa7ebb2a24932c57bc053bf6b6227ce6bb48 /builtin/pull.c | |
| parent | b48c69c3c8a0e6e44f31c70677ac40658d8f3439 (diff) | |
| parent | 408c51f0b4b5f978ab3676a7dc8efaffe459bdee (diff) | |
| download | git-3c0e4178277dee1cdc4607d7277a368379b12b3f.tar.xz | |
Merge branch 'ds/fetch-pull-with-sparse-index'
"git fetch" and "git pull" are now declared sparse-index clean.
Also "git ls-files" learns the "--sparse" option to help debugging.
* ds/fetch-pull-with-sparse-index:
test-read-cache: remove --table, --expand options
t1091/t3705: remove 'test-tool read-cache --table'
t1092: replace 'read-cache --table' with 'ls-files --sparse'
ls-files: add --sparse option
fetch/pull: use the sparse index
Diffstat (limited to 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index c8457619d8..100cbf9fb8 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -994,6 +994,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix) set_reflog_message(argc, argv); git_config(git_pull_config, NULL); + prepare_repo_settings(the_repository); + the_repository->settings.command_requires_full_index = 0; argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0); |