add: update --renormalize to skip sparse paths

We added checks for path_in_sparse_checkout() to portions of 'git add'
that add warnings and prevent stagins a modification, but we skipped the
--renormalize mode. Update renormalize_tracked_files() to ignore cache
entries whose path is outside of the sparse-checkout cone (unless
--sparse is provided). Add a test in t3705.

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

diff --git a/builtin/add.c b/builtin/add.c
index f87b8134b6746c5dc9458a4da6aa69a1f429b69e..f8f0dfa404672960e9ffc10005c355768f8d2755 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -154,7 +154,9 @@ static int renormalize_tracked_files(const struct pathspec *pathspec, int flags)
        for (i = 0; i < active_nr; i++) {
                struct cache_entry *ce = active_cache[i];
 
-               if (ce_skip_worktree(ce))
+               if (!include_sparse &&
+                   (ce_skip_worktree(ce) ||
+                    !path_in_sparse_checkout(ce->name, &the_index)))
                        continue;
                if (ce_stage(ce))
                        continue; /* do not touch unmerged paths */

diff --git a/t/t3705-add-sparse-checkout.sh b/t/t3705-add-sparse-checkout.sh
index 0ae674a17a926d3354b50fa216b1330c95c00a7f..339ec0ed2d695f5299aa51832ec9f1e429a95855 100755 (executable)
--- a/t/t3705-add-sparse-checkout.sh
+++ b/t/t3705-add-sparse-checkout.sh
@@ -172,6 +172,9 @@ test_expect_success 'git add fails outside of sparse-checkout definition' '
        test_must_fail git add --chmod=+x sparse_entry &&
        test_sparse_entry_unstaged &&
 
+       test_must_fail git add --renormalize sparse_entry &&
+       test_sparse_entry_unstaged &&
+
        # Avoid munging CRLFs to avoid an error message
        git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
        test_must_be_empty stderr &&
@@ -181,7 +184,14 @@ test_expect_success 'git add fails outside of sparse-checkout definition' '
        git add --sparse --chmod=+x sparse_entry 2>stderr &&
        test_must_be_empty stderr &&
        test-tool read-cache --table >actual &&
-       grep "^100755 blob.*sparse_entry\$" actual
+       grep "^100755 blob.*sparse_entry\$" actual &&
+
+       git reset &&
+
+       # This will print a message over stderr on Windows.
+       git add --sparse --renormalize sparse_entry &&
+       git status --porcelain >actual &&
+       grep "^M  sparse_entry\$" actual
 '
 
 test_expect_success 'add obeys advice.updateSparsePath' '