Re: git rm --pathspec-from-file does not work in subdirectories
- From
Junio C Hamano <gitster@pobox.com>
- Date
- May 28, 2021, 05:56 UTC
- Message-ID
- <xmqqh7in7650.fsf@gitster.g>
- In-Reply-To
- <CAPig+cT6ztfUYjbsfFmYZ=UOcyk=9rFKqEuE=EE4y2rdBftGag@mail.gmail.com>
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"));