diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-08-04 13:28:53 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-08-04 13:28:53 -0700 |
commit | 506d2a354a9b24c531634094292b11ed8b8c2514 (patch) | |
tree | 2324d28eddd75395949471683f6eeec9781d841d /builtin/commit.c | |
parent | Merge branch 'ab/update-submitting-patches' (diff) | |
parent | unpack-trees: resolve sparse-directory/file conflicts (diff) | |
download | tgif-506d2a354a9b24c531634094292b11ed8b8c2514.tar.xz |
Merge branch 'ds/commit-and-checkout-with-sparse-index'
"git checkout" and "git commit" learn to work without unnecessarily
expanding sparse indexes.
* ds/commit-and-checkout-with-sparse-index:
unpack-trees: resolve sparse-directory/file conflicts
t1092: document bad 'git checkout' behavior
checkout: stop expanding sparse indexes
sparse-index: recompute cache-tree
commit: integrate with sparse-index
p2000: compress repo names
p2000: add 'git checkout -' test and decrease depth
Diffstat (limited to 'builtin/commit.c')
-rw-r--r-- | builtin/commit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 7436262aae..243c626307 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1689,6 +1689,9 @@ int cmd_commit(int argc, const char **argv, const char *prefix) if (argc == 2 && !strcmp(argv[1], "-h")) usage_with_options(builtin_commit_usage, builtin_commit_options); + prepare_repo_settings(the_repository); + the_repository->settings.command_requires_full_index = 0; + status_init_config(&s, git_commit_config); s.commit_template = 1; status_format = STATUS_FORMAT_NONE; /* Ignore status.short */ |