diff options
| author | Taylor Blau <me@ttaylorr.com> | 2022-11-19 02:43:56 +0300 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-11-19 02:43:56 +0300 |
| commit | a92fce4c50d5c45e85a5532cd4425b68c8a99501 (patch) | |
| tree | 602f471b4da6bc05967316b600ce7a7f2e7f3b3a /sequencer.c | |
| parent | 3f98d7ab1b816f403fc12c7a7e056ceba230bab9 (diff) | |
| parent | 652bd0211d456be052ff3e884a5e29b74ff824c0 (diff) | |
Merge branch 'vd/skip-cache-tree-update'
Avoid calling 'cache_tree_update()' when doing so would be redundant.
* vd/skip-cache-tree-update:
rebase: use 'skip_cache_tree_update' option
read-tree: use 'skip_cache_tree_update' option
reset: use 'skip_cache_tree_update' option
unpack-trees: add 'skip_cache_tree_update' option
cache-tree: add perf test comparing update and prime
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index edb01643e1..a46f3ad2e3 100644 --- a/sequencer.c +++ b/sequencer.c @@ -3748,6 +3748,7 @@ static int do_reset(struct repository *r, unpack_tree_opts.merge = 1; unpack_tree_opts.update = 1; unpack_tree_opts.preserve_ignored = 0; /* FIXME: !overwrite_ignore */ + unpack_tree_opts.skip_cache_tree_update = 1; init_checkout_metadata(&unpack_tree_opts.meta, name, &oid, NULL); if (repo_read_index_unmerged(r)) { |