Skip to content

Commit d73eb3a

Browse files
derrickstoleedscho
authored andcommitted
Merge pull request git-for-windows#470: Sparse Index: integrate with git show
As we roll out the sparse index feature, here is a command that I see being used more frequently than other non-integrated commands. (For example, `git mv` is used much less frequently.) Since the index expansion only happens when using `git show :<path>` to indicate that we are looking for a cached value, this is very likely being used by a tool and not directly by users. However, the performance slowdown is around 10x (0.4s to 4.1s at p50). The change here is simple, and we can catch up the performance in the next release. There is a slightly odd behavior change when asking for a directory that now "works" but did not work at all before. See the test change in the second commit for details.
2 parents 8e21784 + a0f8706 commit d73eb3a

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

builtin/log.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,9 @@ int cmd_show(int argc, const char **argv, const char *prefix)
648648
init_log_defaults();
649649
git_config(git_log_config, NULL);
650650

651+
prepare_repo_settings(the_repository);
652+
the_repository->settings.command_requires_full_index = 0;
653+
651654
memset(&match_all, 0, sizeof(match_all));
652655
repo_init_revisions(the_repository, &rev, prefix);
653656
rev.diff = 1;

t/t1092-sparse-checkout-compatibility.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,6 +1164,34 @@ test_expect_success 'clean' '
11641164
test_sparse_match test_path_is_dir folder1
11651165
'
11661166

1167+
test_expect_success 'show (cached blobs/trees)' '
1168+
init_repos &&
1169+
1170+
test_all_match git show :a &&
1171+
test_all_match git show :deep/a &&
1172+
test_sparse_match git show :folder1/a &&
1173+
1174+
# Asking "git show" for directories in the index
1175+
# does not work as implemented. The error message is
1176+
# different for a full checkout and a sparse checkout
1177+
# when the directory is outside of the cone.
1178+
test_all_match test_must_fail git show :deep/ &&
1179+
test_must_fail git -C full-checkout show :folder1/ &&
1180+
test_must_fail git -C sparse-checkout show :folder1/ &&
1181+
1182+
# The sparse index actually has "folder1" inside, so
1183+
# "git show :folder1/" succeeds when it did not before.
1184+
git -C sparse-index show :folder1/ >actual &&
1185+
git -C sparse-index show HEAD:folder1 >expect &&
1186+
1187+
# The output of "git show" includes the way we
1188+
# referenced the objects, so strip that out.
1189+
test_line_count = 4 actual &&
1190+
tail -n 2 actual >actual-trunc &&
1191+
tail -n 2 expect >expect-trunc &&
1192+
test_cmp expect-trunc actual-trunc
1193+
'
1194+
11671195
test_expect_success 'submodule handling' '
11681196
init_repos &&
11691197
@@ -1278,6 +1306,9 @@ test_expect_success 'sparse-index is not expanded' '
12781306
echo >>sparse-index/untracked.txt &&
12791307
ensure_not_expanded add . &&
12801308
1309+
ensure_not_expanded show :a &&
1310+
ensure_not_expanded show :deep/a &&
1311+
12811312
echo >>sparse-index/a &&
12821313
ensure_not_expanded stash &&
12831314
ensure_not_expanded stash list &&

0 commit comments

Comments
 (0)