diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-10-13 15:15:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-10-13 15:15:56 -0700 |
commit | 2d498a7c894444fba5cfb0007e6b757afcde63c6 (patch) | |
tree | 05fe72f5a32240cdcc2c50b912b21f020b40d2ad /advice.c | |
parent | 2bd2f258f4195ac54293a3f45b86457c0bd5fc11 (diff) | |
parent | 6579e788c0a4b9468c5e2954a0868f9db0496e43 (diff) |
Merge branch 'ds/add-rm-with-sparse-index'
"git add", "git mv", and "git rm" have been adjusted to avoid updating paths outside of the sparse-checkout definition unless the user specifies a "--sparse" option. * ds/add-rm-with-sparse-index: advice: update message to suggest '--sparse' mv: refuse to move sparse paths rm: skip sparse paths with missing SKIP_WORKTREE rm: add --sparse option add: update --renormalize to skip sparse paths add: update --chmod to skip sparse paths add: implement the --sparse option add: skip tracked paths outside sparse-checkout cone add: fail when adding an untracked sparse file dir: fix pattern matching on dirs dir: select directories correctly t1092: behavior for adding sparse files t3705: test that 'sparse_entry' is unstaged
Diffstat (limited to 'advice.c')
-rw-r--r-- | advice.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/advice.c b/advice.c index 2f5499a5e1..1dfc91d176 100644 --- a/advice.c +++ b/advice.c @@ -224,15 +224,16 @@ void advise_on_updating_sparse_paths(struct string_list *pathspec_list) if (!pathspec_list->nr) return; - fprintf(stderr, _("The following pathspecs didn't match any" - " eligible path, but they do match index\n" - "entries outside the current sparse checkout:\n")); + fprintf(stderr, _("The following paths and/or pathspecs matched paths that exist\n" + "outside of your sparse-checkout definition, so will not be\n" + "updated in the index:\n")); for_each_string_list_item(item, pathspec_list) fprintf(stderr, "%s\n", item->string); advise_if_enabled(ADVICE_UPDATE_SPARSE_PATH, - _("Disable or modify the sparsity rules if you intend" - " to update such entries.")); + _("If you intend to update such entries, try one of the following:\n" + "* Use the --sparse option.\n" + "* Disable or modify the sparsity rules.")); } void detach_advice(const char *new_name) |