sparse-index: avoid crash on intent-to-add entry outside the cone

When collapsing a full index to a sparse index, the recursive
convert_to_sparse_rec() walks the cache tree to determine if any
of the cache tree entries can be used to represent a sparse directory.

As it goes, the method tracks how many cache entries are being represented
by the cache tree entry. The cache tree node's 'entry_count' represents how
many cache entries are covered by the node.

However, this value can be negative, representing that a node is invalid,
and is no longer reflecting the number of cache entries fit within. This can
happen when the user uses 'git add --intent-to-add' to mark an untracked
file with the intent-to-add bit to avoid committing without finishing the
add.

When such an intent-to-add file exists and the sparse-checkout changes to no
longer contain its parent directory, this leads to a segfault. Two tests are
added to demonstrate this fault:

* One test is added to t3705-add-sparse-checkout.sh to demonstrate
  how 'git add' behaves with sparse-checkout.

* One test is added to t1092-sparse-checkout-compatibility.sh to demonstrate
  the interaction with the sparse index and to compare it directly to how
  the commands behave with a full index or no sparse-checkout.

The fix involves engaging with the loop that iterates over all cache entries
within the parent cache tree node (from 'start' to 'end') and to set the
'span' variable slightly earlier. At this point, the cache entry is for a
file that is at least one directory deeper than the current cache tree node.
The path is also not in the sparse-checkout because of an earlier
path_in_sparse_checkout() check above the loop. So we are trying to collapse
this directory by recursively calling convert_to_sparse_rec() over that span
of entries, but the negative value prevents us from predicting that number
without scanning.

Theoretically, we could scan to find the range of entries that match this
directory and determine if they truly do have an intent-to-add bit and then
collapse as many child trees as possible (the ones with valid cache tree
nodes). That would be a non-trivial change for performance-only benefit.
Since this combination of the intent-to-add and sparse index features has so
far gone undetected by real users, this scenario is unlikely to be worth
such a change.

We settle for the simplest change that prevents a bug: don't try to collapse
a node that is invalid for this reason. The tests that would demonstrate a
segfault now pass. Further, they demonstrate that the intent-to-add bit
persists in the index file after changing the sparse-checkout scope. The
test in t1092 demonstrates how some sparse directories could be collapsed
further with a more involved fix, if so desired in the future.

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

diff --git a/sparse-index.c b/sparse-index.c
index 1ed769b78d8de19a3ea1e0aaa019f81b8a8fe023..c1fa231a89fc07c5bff0f7b3fb709ae6e20f33ca 100644 (file)
--- a/sparse-index.c
+++ b/sparse-index.c
@@ -113,10 +113,17 @@ static int convert_to_sparse_rec(struct index_state *istate,
                        continue;
                }
 
+               span = ct->down[pos]->cache_tree->entry_count;
+               if (span < 0) {
+                       /* cache-tree entry is invalidated, cannot collapse. */
+                       istate->cache[num_converted++] = ce;
+                       i++;
+                       continue;
+               }
+
                strbuf_setlen(&child_path, 0);
                strbuf_add(&child_path, ce->name, slash - ce->name + 1);
 
-               span = ct->down[pos]->cache_tree->entry_count;
                count = convert_to_sparse_rec(istate,
                                              num_converted, i, i + span,
                                              child_path.buf, child_path.len,

diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
index 8186da5c887c56301fb0b2a3ec731b99091bdec9..c433de2c1e02cbbf1c8abe3a167c53ed7d09e19e 100755 (executable)
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -384,6 +384,54 @@ test_expect_success 'add, commit, checkout' '
        test_all_match git checkout -
 '
 
+test_expect_success 'intent-to-add entries outside sparse-checkout' '
+       init_repos &&
+
+       write_script edit-contents <<-\EOF &&
+       echo text >>$1
+       EOF
+
+       test_sparse_match git sparse-checkout set deep folder1 &&
+       run_on_sparse mkdir -p folder1 &&
+       run_on_all ../edit-contents folder1/newita &&
+       test_sparse_match git add -N folder1/newita &&
+
+       test_sparse_match git sparse-checkout set deep &&
+       test_sparse_match git status --porcelain=v2 &&
+       test_sparse_match git ls-files --stage
+'
+
+test_expect_success 'intent-to-add with --sparse outside sparse-checkout' '
+       init_repos &&
+
+       write_script edit-contents <<-\EOF &&
+       echo text >>$1
+       EOF
+
+       run_on_all mkdir -p folder1 &&
+       run_on_all ../edit-contents folder1/newita &&
+       test_all_match git add --sparse --intent-to-add folder1/newita &&
+
+       test_all_match git status --porcelain=v2 &&
+       test_all_match git ls-files --stage &&
+       test_all_match git diff --cached --stat &&
+
+       # Ensure sparse index stores correct sparse directories and
+       # intent-to-add path.
+       git -C sparse-index ls-files --format="%(path)" --sparse >out &&
+
+       # These paths should be present in index as-is.
+       test_grep "^before/\$" out &&
+       test_grep "^folder1/newita\$" out &&
+       test_grep "^folder2/\$" out &&
+       test_grep "^x/\$" out &&
+
+       # folder/0/ could theoretically be collapsed to a sparse
+       # directory entry, but the current implementation avoids the
+       # reduction because of folder1/newita
+       test_grep "^folder1/0/0/0\$" out
+'
+
 test_expect_success 'git add, checkout, and reset with -p' '
        init_repos &&
 

diff --git a/t/t3705-add-sparse-checkout.sh b/t/t3705-add-sparse-checkout.sh
index 53a4782267b705b079f12172183cd76fdb0b0960..cf3f42a353da78bf92b30df3093b95166522bf81 100755 (executable)
--- a/t/t3705-add-sparse-checkout.sh
+++ b/t/t3705-add-sparse-checkout.sh
@@ -233,4 +233,30 @@ test_expect_success 'refuse to add non-skip-worktree file from sparse dir' '
        test_cmp expect stderr
 '
 
+test_expect_success 'intent-to-add entry and sparse index' '
+       test_when_finished "git sparse-checkout disable" &&
+       test_when_finished "git reset --hard" &&
+
+       git sparse-checkout disable &&
+       mkdir -p in out &&
+       echo base >in/file &&
+       echo base >out/file &&
+       git add in/file out/file &&
+       git commit -m "in and out directories" &&
+
+       # enable sparse-checkout, but with all child directories.
+       git config index.sparse true &&
+       git sparse-checkout set in out &&
+
+       # create a new path and set intent-to-add bit
+       echo new >out/newita &&
+       git add -N out/newita &&
+
+       # collapse sparse-checkout, and make sure that the sparse index
+       # maintains the intent-to-add bit.
+       git sparse-checkout set in &&
+       git ls-files --error-unmatch out/newita &&
+       git status --porcelain
+'
+
 test_done