mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-12 02:26:28 +02:00
Code

show: integrate with the sparse index 

The 'git show' command can take an input to request the state of an
object in the index. This can lead to parsing the index in order to load
a specific file entry. Without the change presented here, a sparse index
would expand to a full one, taking much longer than usual to access a
simple file.

There is one behavioral change that happens here, though: we now can
find a sparse directory entry within the index! Commands that previously
failed because we could not find an entry in the worktree or index now
succeed because we _do_ find an entry in the index.

There might be more work to do to make other situations succeed when
looking for an indexed tree, perhaps by looking at or updating the
cache-tree extension as needed. These situations include having a full
index or asking for a directory that is within the sparse-checkout cone
(and hence is not a sparse directory entry in the index).

For now, we demonstrate how the sparse index integration is extremely
simple for files outside of the cone as well as directories within the
cone. A later change will resolve this behavior around sparse
directories.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Derrick Stolee 2022-04-26 20:43:17 +00:00 committed by Junio C Hamano
parent a9e0a49dc4
commit a37d14422a
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/log.c
View File

@ -661,6 +661,11 @@ int cmd_show(int argc, const char **argv, const char *prefix)
init_log_defaults();
git_config(git_log_config, NULL);
if (the_repository->gitdir) {
prepare_repo_settings(the_repository);
the_repository->settings.command_requires_full_index = 0;
}
memset(&match_all, 0, sizeof(match_all));
repo_init_revisions(the_repository, &rev, prefix);
git_config(grep_config, &rev.grep_filter);

24
t/t1092-sparse-checkout-compatibility.sh
View File

@ -1159,12 +1159,21 @@ test_expect_success 'show (cached blobs/trees)' '
test_sparse_match git show :folder1/a &&
# Asking "git show" for directories in the index
# does not work as implemented. The error message is
# different for a full checkout and a sparse checkout
# when the directory is outside of the cone.
# had different behavior depending on the existence
# of a sparse index.
test_all_match test_must_fail git show :deep/ &&
test_must_fail git -C full-checkout show :folder1/ &&
test_sparse_match test_must_fail git show :folder1/
test_must_fail git -C sparse-checkout show :folder1/ &&
git -C sparse-index show :folder1/ >actual &&
git -C full-checkout show HEAD:folder1 >expect &&
# The output of "git show" includes the way we referenced the
# objects, so strip that out.
test_line_count = 4 actual &&
tail -n 2 actual >actual-trunc &&
tail -n 2 expect >expect-trunc &&
test_cmp expect-trunc actual-trunc
'
test_expect_success 'submodule handling' '
@ -1388,6 +1397,13 @@ test_expect_success 'sparse index is not expanded: diff' '
ensure_not_expanded diff --cached
'
test_expect_success 'sparse index is not expanded: show' '
init_repos &&
ensure_not_expanded show :a &&
ensure_not_expanded show :deep/a
'
test_expect_success 'sparse index is not expanded: update-index' '
init_repos &&