Sync with maint

diff --git a/builtin/reset.c b/builtin/reset.c
index 0afe1df250b2d4e416ad1273f75997d739fc94a7..430602d102133d125009e8c8068ce5547c24cab7 100644 (file)
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -257,7 +257,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);
 }