diff-index: integrate with the sparse index

The sparse index allows focusing the index data structure on the files
present in the sparse-checkout, leaving only tree entries for
directories not within the sparse-checkout. Each builtin needs a
repository setting to indicate that it has been tested with the sparse
index before Git will allow the index to be loaded into memory in its
sparse form. This is a safety precaution.

There are still some builtins that haven't been integrated due to the
complexity of the integration and the lack of significant use. However,
'git diff-index' was neglected only because of initial data showing low
usage. The diff machinery was already integrated and there is no more
work to be done there but add some tests to be sure 'git diff-index'
behaves as expected.

For this purpose, we can follow the testing pattern used in 51ba65b5c35
(diff: enable and test the sparse index, 2021-12-06). One difference
here is that we only verify that the sparse index case agrees with the
full index case, but do not generate the expected output. The 'git diff'
tests use the '--name-status' option to ease the creation of the
expected output, but that's not an option for 'diff-index'. Since the
underlying diff machinery is the same, a simple comparison is sufficient
to give some coverage.

Signed-off-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 3e05260ac0e0401188163aeaf4c4d1aea0ba56d1..685b60284fd9e79f231c6dd0ca84cb749d2948bd 100644 (file)
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -25,6 +25,10 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
                usage(diff_cache_usage);
 
        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
+
+       prepare_repo_settings(the_repository);
+       the_repository->settings.command_requires_full_index = 0;
+
        repo_init_revisions(the_repository, &rev, prefix);
        rev.abbrev = 0;
        prefix = precompose_argv_prefix(argc, argv, prefix);

diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index a2c0e1b4dcc56438853752c0b780f644ab3a646a..6fa7f5e9587af863690100797f7ec259c1edece5 100755 (executable)
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -803,6 +803,8 @@ test_expect_success 'update-index --remove outside sparse definition' '
        test_sparse_match git diff --cached --name-status &&
        test_cmp expect sparse-checkout-out &&
 
+       test_sparse_match git diff-index --cached HEAD &&
+
        # Reset the state
        test_all_match git reset --hard &&
 
@@ -812,6 +814,8 @@ test_expect_success 'update-index --remove outside sparse definition' '
        test_sparse_match git diff --cached --name-status &&
        test_must_be_empty sparse-checkout-out &&
 
+       test_sparse_match git diff-index --cached HEAD &&
+
        # Reset the state
        test_all_match git reset --hard &&
 
@@ -823,7 +827,9 @@ test_expect_success 'update-index --remove outside sparse definition' '
        D       folder1/a
        EOF
        test_sparse_match git diff --cached --name-status &&
-       test_cmp expect sparse-checkout-out
+       test_cmp expect sparse-checkout-out &&
+
+       test_sparse_match git diff-index --cached HEAD
 '
 
 test_expect_success 'update-index with directories' '
@@ -1551,7 +1557,7 @@ test_expect_success 'sparse-index is not expanded: describe' '
        ensure_not_expanded describe
 '
 
-test_expect_success 'sparse index is not expanded: diff' '
+test_expect_success 'sparse index is not expanded: diff and diff-index' '
        init_repos &&
 
        write_script edit-contents <<-\EOF &&
@@ -1568,6 +1574,7 @@ test_expect_success 'sparse index is not expanded: diff' '
        test_all_match git diff --cached &&
        ensure_not_expanded diff &&
        ensure_not_expanded diff --cached &&
+       ensure_not_expanded diff-index --cached HEAD &&
 
        # Add file outside cone
        test_all_match git reset --hard &&
@@ -1582,6 +1589,7 @@ test_expect_success 'sparse index is not expanded: diff' '
        test_all_match git diff --cached &&
        ensure_not_expanded diff &&
        ensure_not_expanded diff --cached &&
+       ensure_not_expanded diff-index --cached HEAD &&
 
        # Merge conflict outside cone
        # The sparse checkout will report a warning that is not in the
@@ -1594,7 +1602,8 @@ test_expect_success 'sparse index is not expanded: diff' '
        test_all_match git diff &&
        test_all_match git diff --cached &&
        ensure_not_expanded diff &&
-       ensure_not_expanded diff --cached
+       ensure_not_expanded diff --cached &&
+       ensure_not_expanded diff-index --cached HEAD
 '
 
 test_expect_success 'sparse index is not expanded: show and rev-parse' '