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>
Derrick Stolee committed
Sep 24, 2021 at 15:39 UTC
61d450f049eeb61e6cb3c07750e806db29ff0ea3
2 files changed
+14
-2
builtin/add.c
+3
-1
@@ -154,7 +154,9 @@ static int renormalize_tracked_files(const struct pathspec *pathspec, int flags)
154
for (i = 0; i < active_nr; i++) {
155
struct cache_entry *ce = active_cache[i];
156
157
- if (ce_skip_worktree(ce))
157
+ if (!include_sparse &&
158
+ (ce_skip_worktree(ce) ||
159
+ !path_in_sparse_checkout(ce->name, &the_index)))
160
continue;
161
if (ce_stage(ce))
162
continue; /* do not touch unmerged paths */
t/t3705-add-sparse-checkout.sh
+11
-1
@@ -172,6 +172,9 @@ test_expect_success 'git add fails outside of sparse-checkout definition' '
172
test_must_fail git add --chmod=+x sparse_entry &&
173
test_sparse_entry_unstaged &&
174
175
+ test_must_fail git add --renormalize sparse_entry &&
176
+ test_sparse_entry_unstaged &&
177
+
178
# Avoid munging CRLFs to avoid an error message
179
git -c core.autocrlf=input add --sparse sparse_entry 2>stderr &&
180
test_must_be_empty stderr &&
@@ -181,7 +184,14 @@ test_expect_success 'git add fails outside of sparse-checkout definition' '
184
git add --sparse --chmod=+x sparse_entry 2>stderr &&
185
test_must_be_empty stderr &&
186
test-tool read-cache --table >actual &&
184
- grep "^100755 blob.*sparse_entry\$" actual
187
+ grep "^100755 blob.*sparse_entry\$" actual &&
188
+
189
+ git reset &&
190
+
191
+ # This will print a message over stderr on Windows.
192
+ git add --sparse --renormalize sparse_entry &&
193
+ git status --porcelain >actual &&
194
+ grep "^M sparse_entry\$" actual
195
'
196
197
test_expect_success 'add obeys advice.updateSparsePath' '