undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reset: use 'skip_cache_tree_update' option

Browse Source 
Enable the 'skip_cache_tree_update' option in the variants that call
'prime_cache_tree()' after 'unpack_trees()' (specifically, 'git reset
--mixed' and 'git reset --hard'). This avoids redundantly rebuilding the
cache tree in both 'cache_tree_update()' at the end of 'unpack_trees()' and
in 'prime_cache_tree()', resulting in a small (but consistent) performance
improvement. From the newly-added 'p7102-reset.sh' test:

Test                         before            after
--------------------------------------------------------------------
7102.1: reset --hard (...)   2.11(0.40+1.54)   1.97(0.38+1.47) -6.6%

Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
This commit is contained in:
Victoria Dye 2022-11-10 19:06:03 +00:00 committed by Taylor Blau
parent 68fcd48baf
commit 0e47bca0f7
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/reset.c
View File

@ -73,9 +73,11 @@ static int reset_index(const char *ref, const struct object_id *oid, int reset_t
case HARD: case HARD:
opts.update = 1; opts.update = 1;
opts.reset = UNPACK_RESET_OVERWRITE_UNTRACKED; opts.reset = UNPACK_RESET_OVERWRITE_UNTRACKED;
opts.skip_cache_tree_update = 1;
break; break;
case MIXED: case MIXED:
opts.reset = UNPACK_RESET_PROTECT_UNTRACKED; opts.reset = UNPACK_RESET_PROTECT_UNTRACKED;
opts.skip_cache_tree_update = 1;
/* but opts.update=0, so working tree not updated */ /* but opts.update=0, so working tree not updated */
break; break;
default: default:

21
t/perf/p7102-reset.sh Executable file
View File

@ -0,0 +1,21 @@
#!/bin/sh
test_description='performance of reset'
. ./perf-lib.sh
test_perf_default_repo
test_checkout_worktree
test_perf 'reset --hard with change in tree' '
base=$(git rev-parse HEAD) &&
test_commit --no-tag A &&
new=$(git rev-parse HEAD) &&
for i in $(test_seq 10)
do
git reset --hard $new &&
git reset --hard $base || return $?
done
'
test_done