Skip to content

Commit 1a65b41

Browse files
Cheskaqiqigitster
authored andcommitted
write-tree: integrate with sparse index
Update 'git write-tree' to allow using the sparse-index in memory without expanding to a full one. The recursive algorithm for update_one() was already updated in 2de37c5 (cache-tree: integrate with sparse directory entries, 2021-03-03) to handle sparse directory entries in the index. Hence we can just set the requires-full-index to false for "write-tree". The `p2000` tests demonstrate a ~96% execution time reduction for 'git write-tree' using a sparse index: Test before after ----------------------------------------------------------------- 2000.78: git write-tree (full-v3) 0.34 0.33 -2.9% 2000.79: git write-tree (full-v4) 0.32 0.30 -6.3% 2000.80: git write-tree (sparse-v3) 0.47 0.02 -95.8% 2000.81: git write-tree (sparse-v4) 0.45 0.02 -95.6% Signed-off-by: Shuqi Liang <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 768bb23 commit 1a65b41

File tree

3 files changed

+32
-0
lines changed

3 files changed

+32
-0
lines changed

builtin/write-tree.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ int cmd_write_tree(int argc, const char **argv, const char *cmd_prefix)
3838
argc = parse_options(argc, argv, cmd_prefix, write_tree_options,
3939
write_tree_usage, 0);
4040

41+
prepare_repo_settings(the_repository);
42+
the_repository->settings.command_requires_full_index = 0;
43+
4144
ret = write_cache_as_tree(&oid, flags, tree_prefix);
4245
switch (ret) {
4346
case 0:

t/perf/p2000-sparse-operations.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,5 +125,6 @@ test_perf_on_all git checkout-index -f --all
125125
test_perf_on_all git update-index --add --remove $SPARSE_CONE/a
126126
test_perf_on_all "git rm -f $SPARSE_CONE/a && git checkout HEAD -- $SPARSE_CONE/a"
127127
test_perf_on_all git grep --cached --sparse bogus -- "f2/f1/f1/*"
128+
test_perf_on_all git write-tree
128129

129130
test_done

t/t1092-sparse-checkout-compatibility.sh

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2055,4 +2055,32 @@ test_expect_success 'grep sparse directory within submodules' '
20552055
test_cmp actual expect
20562056
'
20572057

2058+
test_expect_success 'write-tree on all' '
2059+
init_repos &&
2060+
2061+
write_script edit-contents <<-\EOF &&
2062+
echo text >>"$1"
2063+
EOF
2064+
2065+
run_on_all ../edit-contents deep/a &&
2066+
run_on_all git update-index deep/a &&
2067+
test_all_match git write-tree &&
2068+
2069+
run_on_all mkdir -p folder1 &&
2070+
run_on_all cp a folder1/a &&
2071+
run_on_all ../edit-contents folder1/a &&
2072+
run_on_all git update-index folder1/a &&
2073+
test_all_match git write-tree
2074+
'
2075+
2076+
test_expect_success 'sparse-index is not expanded: write-tree' '
2077+
init_repos &&
2078+
2079+
ensure_not_expanded write-tree &&
2080+
2081+
echo "test1" >>sparse-index/a &&
2082+
git -C sparse-index update-index a &&
2083+
ensure_not_expanded write-tree
2084+
'
2085+
20582086
test_done

0 commit comments

Comments
 (0)