Skip to content

Commit 058b7a9

Browse files
committed
blame: enable and test the sparse index
Enable the sparse index for the 'git blame' command. The index was already not expanded with this command, so the most interesting thing to do is to add tests that verify that 'git blame' behaves correctly when the sparse index is enabled and that its performance improves. More specifically, these cases are: 1. The index is not expanded for `blame` when given paths in the sparse checkout cone at multiple levels. 2. Performance measurably improves for `blame` with sparse index when given paths in the sparse checkout cone at multiple levels. The following are the performance results comparing the branch with sparse index enabled for `blame` with the vfs-2.33.0 branch in the microsoft/git repository: ``` Test msft/vfs-2.33.0 sparse-index-blame ----------------------------------------------------------------------------------- 2000.62: git blame f2/f4/a (full-v3) 0.31(0.21+0.09) 0.32(0.21+0.10) +3.2% 2000.63: git blame f2/f4/a (full-v4) 0.29(0.19+0.08) 0.31(0.21+0.08) +6.9% 2000.64: git blame f2/f4/a (sparse-v3) 0.55(0.38+0.14) 0.23(0.14+0.07) -58.2% 2000.65: git blame f2/f4/a (sparse-v4) 0.57(0.40+0.16) 0.23(0.15+0.07) -59.6% 2000.66: git blame f2/f4/f3/a (full-v3) 0.77(0.56+0.20) 0.85(0.60+0.22) +10.4% 2000.67: git blame f2/f4/f3/a (full-v4) 0.78(0.56+0.20) 0.81(0.59+0.21) +3.8% 2000.68: git blame f2/f4/f3/a (sparse-v3) 1.07(0.78+0.28) 0.72(0.52+0.19) -32.7% 2000.99: git blame f2/f4/f3/a (sparse-v4) 1.05(0.78+0.26) 0.73(0.51+0.19) -30.5% ``` We do not include paths outside the sparse checkout cone because blame currently does not support blaming files outside of the sparse definition. Attempting to do so fails with the following error: fatal: no such path '<path outside sparse definition>' in HEAD Signed-off-by: Lessley Dennington <[email protected]>
1 parent b05892f commit 058b7a9

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

builtin/blame.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -902,6 +902,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
902902
long anchor;
903903
const int hexsz = the_hash_algo->hexsz;
904904

905+
prepare_repo_settings(the_repository);
906+
the_repository->settings.command_requires_full_index = 0;
905907
setup_default_color_by_age();
906908
git_config(git_blame_config, &output_option);
907909
repo_init_revisions(the_repository, &revs, NULL);

t/perf/p2000-sparse-operations.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,5 +121,7 @@ test_perf_on_all git update-index --add --remove
121121
test_perf_on_all git diff
122122
test_perf_on_all git diff --staged
123123
test_perf_on_all git sparse-checkout reapply
124+
test_perf_on_all git blame $SPARSE_CONE/a
125+
test_perf_on_all git blame $SPARSE_CONE/f3/a
124126

125127
test_done

t/t1092-sparse-checkout-compatibility.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,6 +1322,15 @@ test_expect_success 'stash -u outside sparse checkout definition' '
13221322
test_all_match git status --porcelain=v2
13231323
'
13241324

1325+
test_expect_success 'sparse index is not expanded: blame' '
1326+
init_repos &&
1327+
1328+
ensure_not_expanded blame a &&
1329+
ensure_not_expanded blame deep/a &&
1330+
ensure_not_expanded blame deep/deeper1/a &&
1331+
ensure_not_expanded blame deep/deeper1/deepest/a
1332+
'
1333+
13251334
# NEEDSWORK: a sparse-checkout behaves differently from a full checkout
13261335
# in this scenario, but it shouldn't.
13271336
test_expect_success 'reset mixed and checkout orphan' '

0 commit comments

Comments
 (0)