rev-parse: integrate with sparse index

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>

diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 8480a59f573e28d7777ee7e0dd21a2a640657641..4fc6185b2d1bf7a7fbc607ca0a5fd54dcb3077e8 100644 (file)
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -723,6 +723,9 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
                        prefix = setup_git_directory();
                        git_config(git_default_config, NULL);
                        did_repo_setup = 1;
+
+                       prepare_repo_settings(the_repository);
+                       the_repository->settings.command_requires_full_index = 0;
                }
 
                if (!strcmp(arg, "--")) {

diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index fa1d5603605fc138ce6842b4537563fcc5874894..93bcfd20bbc7e4456c69a8684f3ae340b3947110 100755 (executable)
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -1151,29 +1151,32 @@ test_expect_success 'clean' '
        test_sparse_match test_path_is_dir folder1
 '
 
-test_expect_success 'show (cached blobs/trees)' '
-       init_repos &&
+for builtin in show rev-parse
+do
+       test_expect_success "$builtin (cached blobs/trees)" "
+               init_repos &&
 
-       test_all_match git show :a &&
-       test_all_match git show :deep/a &&
-       test_sparse_match git show :folder1/a &&
+               test_all_match git $builtin :a &&
+               test_all_match git $builtin :deep/a &&
+               test_sparse_match git $builtin :folder1/a &&
 
-       # The error message differs depending on whether
-       # the directory exists in the worktree.
-       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/ &&
+               # The error message differs depending on whether
+               # the directory exists in the worktree.
+               test_all_match test_must_fail git $builtin :deep/ &&
+               test_must_fail git -C full-checkout $builtin :folder1/ &&
+               test_sparse_match test_must_fail git $builtin :folder1/ &&
 
-       # Change the sparse cone for an extra case:
-       run_on_sparse git sparse-checkout set deep/deeper1 &&
+               # Change the sparse cone for an extra case:
+               run_on_sparse git sparse-checkout set deep/deeper1 &&
 
-       # deep/deeper2 is a sparse directory in the sparse index.
-       test_sparse_match test_must_fail git show :deep/deeper2/ &&
+               # deep/deeper2 is a sparse directory in the sparse index.
+               test_sparse_match test_must_fail git $builtin :deep/deeper2/ &&
 
-       # deep/deeper2/deepest is not in the sparse index, but
-       # will trigger an index expansion.
-       test_sparse_match test_must_fail git show :deep/deeper2/deepest/
-'
+               # deep/deeper2/deepest is not in the sparse index, but
+               # will trigger an index expansion.
+               test_sparse_match test_must_fail git $builtin :deep/deeper2/deepest/
+       "
+done
 
 test_expect_success 'submodule handling' '
        init_repos &&
@@ -1396,11 +1399,13 @@ test_expect_success 'sparse index is not expanded: diff' '
        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 &&
 
        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' '