diff options
| author |  Derrick Stolee <dstolee@microsoft.com> | 2021-09-24 15:39:12 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-09-28 10:31:02 -0700 |
| commit | d7c4415e554ac62e49c9616bca5087b4b1310e5a (patch) | |
| tree | 7f1163aad22d29a73bae90e149d457d8571d4aee /builtin | |
| parent | rm: add --sparse option (diff) | |
| download | tgif-d7c4415e554ac62e49c9616bca5087b4b1310e5a.tar.xz | |
rm: skip sparse paths with missing SKIP_WORKTREE
If a path does not match the sparse-checkout cone but is somehow missing
the SKIP_WORKTREE bit, then 'git rm' currently succeeds in removing the
file. One reason a user might be in this situation is a merge conflict
outside of the sparse-checkout cone. Removing such a file might be
problematic for users who are not sure what they are doing.
Add a check to path_in_sparse_checkout() when 'git rm' is checking if a
path should be considered for deletion. Of course, this check is ignored
if the '--sparse' option is specified, allowing users who accept the
risks to continue with the removal.
This also removes a confusing behavior where a user asks for a directory
to be removed, but only the entries that are within the sparse-checkout
definition are removed. Now, 'git rm <dir>' will fail without '--sparse'
and will succeed in removing all contained paths with '--sparse'.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index 4208f3f9a5..a6da03da2b 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; if (!ce_path_match(&the_index, ce, &pathspec, seen)) continue; |