summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2021-09-24 15:39:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-28 17:31:02 (GMT)
commit61d450f049eeb61e6cb3c07750e806db29ff0ea3 (patch)
treeac3903983ac107118bcc0fe4b690436bbb6f2731
parent63b60b3add7527c202124982e0b14a6a512f0450 (diff)
downloadgit-61d450f049eeb61e6cb3c07750e806db29ff0ea3.zip
git-61d450f049eeb61e6cb3c07750e806db29ff0ea3.tar.gz
git-61d450f049eeb61e6cb3c07750e806db29ff0ea3.tar.bz2
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>
-rw-r--r--builtin/add.c4
-rwxr-xr-xt/t3705-add-sparse-checkout.sh12
2 files changed, 14 insertions, 2 deletions
diff --git a/builtin/add.c b/builtin/add.c
index f87b813..f8f0dfa 100644
--- 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 0ae674a..339ec0e 100755
--- 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' '