object-name: diagnose trees in index properly

When running 'git show :<path>' where '<path>' is a directory, then
there is a subtle difference between a full checkout and a sparse
checkout. The error message from diagnose_invalid_index_path() reports
whether the path is on disk or not. The full checkout will have the
directory on disk, but the path will not be in the index. The sparse
checkout could have the directory not exist, specifically when that
directory is outside of the sparse-checkout cone.

In the case of a sparse index, we have yet another state: the path can
be a sparse directory in the index. In this case, the error message from
diagnose_invalid_index_path() would erroneously say "path '<path>' is in
the index, but not at stage 0", which is false.

Add special casing around sparse directory entries so we get to the
correct error message. This requires two checks in order to get parity
with the normal sparse-checkout case.

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

diff --git a/object-name.c b/object-name.c
index 2dc5d2549b8beff45ec73b88828ea5e91e28e569..4d2746574cde0b813a73772c13d71a30db696128 100644 (file)
--- a/object-name.c
+++ b/object-name.c
@@ -1832,7 +1832,8 @@ static void diagnose_invalid_index_path(struct repository *r,
                pos = -pos - 1;
        if (pos < istate->cache_nr) {
                ce = istate->cache[pos];
-               if (ce_namelen(ce) == namelen &&
+               if (!S_ISSPARSEDIR(ce->ce_mode) &&
+                   ce_namelen(ce) == namelen &&
                    !memcmp(ce->name, filename, namelen))
                        die(_("path '%s' is in the index, but not at stage %d\n"
                            "hint: Did you mean ':%d:%s'?"),
@@ -1848,7 +1849,8 @@ static void diagnose_invalid_index_path(struct repository *r,
                pos = -pos - 1;
        if (pos < istate->cache_nr) {
                ce = istate->cache[pos];
-               if (ce_namelen(ce) == fullname.len &&
+               if (!S_ISSPARSEDIR(ce->ce_mode) &&
+                   ce_namelen(ce) == fullname.len &&
                    !memcmp(ce->name, fullname.buf, fullname.len))
                        die(_("path '%s' is in the index, but not '%s'\n"
                            "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"),

diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index 08c9cfd359ed13f6a8033848ad1872f4b454867a..fa1d5603605fc138ce6842b4537563fcc5874894 100755 (executable)
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -1158,15 +1158,21 @@ test_expect_success 'show (cached blobs/trees)' '
        test_all_match git show :deep/a &&
        test_sparse_match git show :folder1/a &&
 
-       # Asking "git show" for directories in the index
-       # had different behavior depending on the existence
-       # of a sparse index.
+       # 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_must_fail git -C sparse-checkout show :folder1/ &&
+       test_sparse_match test_must_fail git show :folder1/ &&
 
-       test_must_fail git -C sparse-index show :folder1/ 2>err &&
-       grep "is in the index, but not at stage 0" err
+       # 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/deepest is not in the sparse index, but
+       # will trigger an index expansion.
+       test_sparse_match test_must_fail git show :deep/deeper2/deepest/
 '
 
 test_expect_success 'submodule handling' '