diff options
| author | Brandon Williams <bmwill@google.com> | 2017-05-11 15:04:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-12 14:23:46 +0900 |
| commit | 2249d4dbc197d45da5407cbc80b2461e49bb8785 (patch) | |
| tree | f70385d817d8067936ef0fcdc842be33994572ec /builtin/reset.c | |
| parent | cbca060e102aedcedbd1c4b5394aeed24885d5de (diff) | |
| download | git-2249d4dbc197d45da5407cbc80b2461e49bb8785.tar.gz | |
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/reset.c')
| -rw-r--r-- | builtin/reset.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index fc3b906c47..5db2adc4c4 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -236,7 +236,6 @@ static void parse_args(struct pathspec *pathspec, parse_pathspec(pathspec, 0, PATHSPEC_PREFER_FULL | - PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP | (patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0), prefix, argv); } |