diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-30 11:16:40 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-30 11:16:40 +0900 |
| commit | 3c5a78280fa5535050fe83b51cafb9ca51e8d9e8 (patch) | |
| tree | c4872e1654f52d2e5e9c5160479b26c778697074 /builtin/reset.c | |
| parent | 78089b71da60fcf846b2e7029a90db492f1d3a9d (diff) | |
| parent | 08de9151a8a67f29a3a5a36931298237d78ca736 (diff) | |
| download | git-3c5a78280fa5535050fe83b51cafb9ca51e8d9e8.tar.gz | |
Merge branch 'bw/pathspec-sans-the-index'
Simplify parse_pathspec() codepath and stop it from looking at the
default in-core index.
* bw/pathspec-sans-the-index:
pathspec: convert find_pathspecs_matching_against_index to take an index
pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP
ls-files: prevent prune_cache from overeagerly pruning submodules
pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE flag
submodule: add die_in_unpopulated_submodule function
pathspec: provide a more descriptive die message
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 0afe1df250..430602d102 100644 --- 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); } |