diff options
author | Brandon Williams <bmwill@google.com> | 2017-05-12 01:04:26 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-05-12 08:23:46 +0300 |
commit | 2249d4dbc197d45da5407cbc80b2461e49bb8785 (patch) | |
tree | f70385d817d8067936ef0fcdc842be33994572ec /builtin/rm.c | |
parent | cbca060e102aedcedbd1c4b5394aeed24885d5de (diff) |
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 <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rm.c')
-rw-r--r-- | builtin/rm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index fb79dcab181..7c323d01235 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); |