From 2249d4dbc197d45da5407cbc80b2461e49bb8785 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Thu, 11 May 2017 15:04:26 -0700 Subject: pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP Since (ae8d08242 pathspec: pass directory indicator to match_pathspec_item()) the path matching logic has been able to cope with submodules without needing to strip off a trailing slash if a path refers to a submodule. Since stripping the slash is no longer necessary, remove the PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP flag. Signed-off-by: Brandon Williams Signed-off-by: Junio C Hamano --- builtin/rm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'builtin/rm.c') diff --git a/builtin/rm.c b/builtin/rm.c index fb79dcab1..7c323d012 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -271,8 +271,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix) die(_("index file corrupt")); parse_pathspec(&pathspec, 0, - PATHSPEC_PREFER_CWD | - PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP, + PATHSPEC_PREFER_CWD, prefix, argv); refresh_index(&the_index, REFRESH_QUIET, &pathspec, NULL, NULL); -- cgit v1.2.1