git rm --pathspec-from-file does not work in subdirectories

git rm --pathspec-from-file does not work in subdirectories

[Dietrich Epp]

How to reproduce: cd into a subdirectory and use git rm
--pathspec-from-file. For example, in Git's repo, at the top level:

$ git rm --pathspec-from-file=/dev/null
fatal: No pathspec was given. Which files should I remove?
$ cd compat
$ git rm --pathspec-from-file=/dev/null
fatal: --pathspec-from-file is incompatible with pathspec arguments

However, git add works as expected.

Tested on commit 5afd72a96f0a3f65a832fd1448d9de1c534aaa69 (master)

Re: git rm --pathspec-from-file does not work in subdirectories

[Junio C Hamano]

Dietrich Epp <depp@moria.us> writes:

> How to reproduce: cd into a subdirectory and use git rm
> --pathspec-from-file. For example, in Git's repo, at the top level:
>
> $ git rm --pathspec-from-file=/dev/null
> fatal: No pathspec was given. Which files should I remove?
> $ cd compat
> $ git rm --pathspec-from-file=/dev/null
> fatal: --pathspec-from-file is incompatible with pathspec arguments

Thanks for a report.

I think this reveals issues with not just the --pathspec-from-file
which has been added relatively recently, but potentially a larger
issue "git rm" from subdirectory has.

When run from a subdirectory, "git rm" without pathspec behaves
as if a single "." (i.e. everything underneath the current
directory) is given as the pathspec.  Of course, this is incompatible
with reading of the pathspec elements from a file and unfortunately
it cannot be disabled, so there currently is no way to use the option
if you are in a subdirectory.

But a potentially larger problem is that "git rm -r" will remove
everything under the current directory unless you are at the top
level of the working tree, even when the user does not give "." to
explicitly say "I want everything under the current directory gone".

I wonder if the attached patch would make both issues better.

Re: git rm --pathspec-from-file does not work in subdirectories

[Eric Sunshine]

On Fri, May 28, 2021 at 1:07 AM Junio C Hamano <gitster@pobox.com> wrote:
> I wonder if the attached patch would make both issues better.

The "attached patch" is missing.

Re: git rm --pathspec-from-file does not work in subdirectories

[Junio C Hamano]

Eric Sunshine <sunshine@sunshineco.com> writes:

> On Fri, May 28, 2021 at 1:07 AM Junio C Hamano <gitster@pobox.com> wrote:
>> I wonder if the attached patch would make both issues better.
>
> The "attached patch" is missing.

Heh.  Something along this line, but I think pathspec-from-file
still needs a bit more work even with this patch.

 builtin/rm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git c/builtin/rm.c w/builtin/rm.c
index 8a24c715e0..a4a8a1ad8d 100644
--- c/builtin/rm.c
+++ w/builtin/rm.c
@@ -265,7 +265,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 			     builtin_rm_usage, 0);
 
 	parse_pathspec(&pathspec, 0,
-		       PATHSPEC_PREFER_CWD,
+		       PATHSPEC_PREFER_FULL,
 		       prefix, argv);
 
 	if (pathspec_from_file) {
@@ -273,7 +273,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
 
 		parse_pathspec_file(&pathspec, 0,
-				    PATHSPEC_PREFER_CWD,
+				    PATHSPEC_PREFER_FULL,
 				    prefix, pathspec_from_file, pathspec_file_nul);
 	} else if (pathspec_file_nul) {
 		die(_("--pathspec-file-nul requires --pathspec-from-file"));