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

rev-parse: integrate with sparse index

Browse Source 
It is not obvious that the 'git rev-parse' builtin would use the sparse
index, but it is possible to parse paths out of the index using the
":<path>" syntax. The 'git rev-parse' output is only the OID of the
object found at that location, but otherwise behaves similarly to 'git
show :<path>'. This includes the failure conditions on directories and
the error messages depending on whether a path is in the worktree or
not.

The only code change required is to change the
command_requires_full_index setting in builtin/rev-parse.c, and we can
re-use many existing 'git show' tests for the rev-parse case.

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:20 +00:00 committed by Junio C Hamano
parent 4925adb4da
commit 124b05b230
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/rev-parse.c
View File

@ -723,6 +723,9 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
prefix = setup_git_directory(); prefix = setup_git_directory();
git_config(git_default_config, NULL); git_config(git_default_config, NULL);
did_repo_setup = 1; did_repo_setup = 1;
prepare_repo_settings(the_repository);
the_repository->settings.command_requires_full_index = 0;
} }
if (!strcmp(arg, "--")) { if (!strcmp(arg, "--")) {

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

@ -1151,29 +1151,32 @@ test_expect_success 'clean' '
test_sparse_match test_path_is_dir folder1 test_sparse_match test_path_is_dir folder1
' '
test_expect_success 'show (cached blobs/trees)' ' for builtin in show rev-parse
init_repos && do
test_expect_success "$builtin (cached blobs/trees)" "
init_repos &&
test_all_match git show :a && test_all_match git $builtin :a &&
test_all_match git show :deep/a && test_all_match git $builtin :deep/a &&
test_sparse_match git show :folder1/a && test_sparse_match git $builtin :folder1/a &&
# The error message differs depending on whether # The error message differs depending on whether
# the directory exists in the worktree. # the directory exists in the worktree.
test_all_match test_must_fail git show :deep/ && test_all_match test_must_fail git $builtin :deep/ &&
test_must_fail git -C full-checkout show :folder1/ && test_must_fail git -C full-checkout $builtin :folder1/ &&
test_sparse_match test_must_fail git show :folder1/ && test_sparse_match test_must_fail git $builtin :folder1/ &&
# Change the sparse cone for an extra case: # Change the sparse cone for an extra case:
run_on_sparse git sparse-checkout set deep/deeper1 && run_on_sparse git sparse-checkout set deep/deeper1 &&
# deep/deeper2 is a sparse directory in the sparse index. # deep/deeper2 is a sparse directory in the sparse index.
test_sparse_match test_must_fail git show :deep/deeper2/ && test_sparse_match test_must_fail git $builtin :deep/deeper2/ &&
# deep/deeper2/deepest is not in the sparse index, but # deep/deeper2/deepest is not in the sparse index, but
# will trigger an index expansion. # will trigger an index expansion.
test_sparse_match test_must_fail git show :deep/deeper2/deepest/ test_sparse_match test_must_fail git $builtin :deep/deeper2/deepest/
' "
done
test_expect_success 'submodule handling' ' test_expect_success 'submodule handling' '
init_repos && init_repos &&
@ -1396,11 +1399,13 @@ test_expect_success 'sparse index is not expanded: diff' '
ensure_not_expanded diff --cached ensure_not_expanded diff --cached
' '
test_expect_success 'sparse index is not expanded: show' ' test_expect_success 'sparse index is not expanded: show and rev-parse' '
init_repos && init_repos &&
ensure_not_expanded show :a && ensure_not_expanded show :a &&
ensure_not_expanded show :deep/a ensure_not_expanded show :deep/a &&
ensure_not_expanded rev-parse :a &&
ensure_not_expanded rev-parse :deep/a
' '
test_expect_success 'sparse index is not expanded: update-index' ' test_expect_success 'sparse index is not expanded: update-index' '