Re: [PATCH 10/13] rm: skip sparse paths with missing SKIP_WORKTREE
- From
Matheus Tavares Bernardino <matheus.bernardino@usp.br>
- Date
- Aug 27, 2021, 21:18 UTC
- Message-ID
- <CAHd-oW50QSBmtdNhwur=OcgcPnMBgszCp7aPbmwvz7qMPFj0iQ@mail.gmail.com>
- In-Reply-To
- <5153accded46c8ced8784ec135dbc77d5bc1a306.1629842085.git.gitgitgadget@gmail.com>
On Tue, Aug 24, 2021 at 6:54 PM Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com> wrote:
Show 14 quoted lines
>
> diff --git a/builtin/rm.c b/builtin/rm.c
> index 4208f3f9a5f..a6da03da2be 100644
> --- a/builtin/rm.c
> +++ b/builtin/rm.c
> @@ -301,7 +301,9 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
> for (i = 0; i < active_nr; i++) {
> const struct cache_entry *ce = active_cache[i];
>
> - if (!include_sparse && ce_skip_worktree(ce))
> + if (!include_sparse &&
> + (ce_skip_worktree(ce) ||
> + !path_in_sparse_checkout(ce->name, &the_index)))
> continue;OK. And we don't need to update the advice reporting code below, because `matches_skip_worktree()` already uses the `(ce_skip_worktree(ce) || !path_in_sparse_checkout())` logic.
> + !path_in_sparse_checkout"
Show 20 quoted lines
> if (!ce_path_match(&the_index, ce, &pathspec, seen)) > continue; > diff --git a/t/t3602-rm-sparse-checkout.sh b/t/t3602-rm-sparse-checkout.sh > index a34b978bfd8..44f3e923164 100755 > --- a/t/t3602-rm-sparse-checkout.sh > +++ b/t/t3602-rm-sparse-checkout.sh > @@ -87,4 +87,15 @@ test_expect_success 'do not warn about sparse entries with --ignore-unmatch' ' > git ls-files --error-unmatch b > ' > > +test_expect_success 'refuse to rm a non-skip-worktree path outside sparse cone' ' > + git reset --hard && > + git sparse-checkout set a && > + git update-index --no-skip-worktree b && > + test_must_fail git rm b 2>stderr && > + test_cmp b_error_and_hint stderr && > + git rm --sparse b 2>stderr && > + test_must_be_empty stderr && > + test_path_is_missing b > +'
OK.