summaryrefslogtreecommitdiff
path: root/t/t3705-add-sparse-checkout.sh
diff options
context:
space:
mode:
authorDerrick Stolee <dstolee@microsoft.com>2021-09-24 15:39:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-28 17:31:02 (GMT)
commit6579e788c0a4b9468c5e2954a0868f9db0496e43 (patch)
tree45c3cbec6276f2afdcea800939e027ee3a3fcae1 /t/t3705-add-sparse-checkout.sh
parent93d2c160411e2a3309a8e2f55eb53bd6c78b7262 (diff)
downloadgit-6579e788c0a4b9468c5e2954a0868f9db0496e43.zip
git-6579e788c0a4b9468c5e2954a0868f9db0496e43.tar.gz
git-6579e788c0a4b9468c5e2954a0868f9db0496e43.tar.bz2
advice: update message to suggest '--sparse'
The previous changes modified the behavior of 'git add', 'git rm', and 'git mv' to not adjust paths outside the sparse-checkout cone, even if they exist in the working tree and their cache entries lack the SKIP_WORKTREE bit. The intention is to warn users that they are doing something potentially dangerous. The '--sparse' option was added to each command to allow careful users the same ability they had before. To improve the discoverability of this new functionality, add a message to advice.updateSparsePath that mentions the existence of the option. The previous set of changes also modified the purpose of this message to include possibly a list of paths instead of only a list of pathspecs. Make the warning message more clear about this new behavior. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3705-add-sparse-checkout.sh')
-rwxr-xr-xt/t3705-add-sparse-checkout.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/t/t3705-add-sparse-checkout.sh b/t/t3705-add-sparse-checkout.sh
index 339ec0e..5b90498 100755
--- a/t/t3705-add-sparse-checkout.sh
+++ b/t/t3705-add-sparse-checkout.sh
@@ -44,12 +44,15 @@ test_sparse_entry_unstaged () {
test_expect_success 'setup' "
cat >sparse_error_header <<-EOF &&
- The following pathspecs didn't match any eligible path, but they do match index
- entries outside the current sparse checkout:
+ The following paths and/or pathspecs matched paths that exist
+ outside of your sparse-checkout definition, so will not be
+ updated in the index:
EOF
cat >sparse_hint <<-EOF &&
- hint: Disable or modify the sparsity rules if you intend to update such entries.
+ hint: If you intend to update such entries, try one of the following:
+ hint: * Use the --sparse option.
+ hint: * Disable or modify the sparsity rules.
hint: Disable this message with \"git config advice.updateSparsePath false\"
EOF