diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:15 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-02-27 14:01:15 -0800 |
commit | cbaeafc3251d08b479c5eb735444bb6ad6210c93 (patch) | |
tree | 5513bd0aab1246167f737639e72022c0de64b1a6 /builtin/checkout.c | |
parent | 156d6ed9221ff38c4cd3bfcfc6778e31c104fd9b (diff) | |
parent | 2e70c01799bf663cc1fa5f6e37e025000ffdc0b0 (diff) | |
download | git-cbaeafc3251d08b479c5eb735444bb6ad6210c93.tar.gz git-cbaeafc3251d08b479c5eb735444bb6ad6210c93.tar.xz |
Merge branch 'nd/submodule-pathspec-ending-with-slash'
Allow "git cmd path/", when the 'path' is where a submodule is
bound to the top-level working tree, to match 'path', despite the
extra and unnecessary trailing slash.
* nd/submodule-pathspec-ending-with-slash:
clean: use cache_name_is_other()
clean: replace match_pathspec() with dir_path_match()
pathspec: pass directory indicator to match_pathspec_item()
match_pathspec: match pathspec "foo/" against directory "foo"
dir.c: prepare match_pathspec_item for taking more flags
pathspec: rename match_pathspec_depth() to match_pathspec()
pathspec: convert some match_pathspec_depth() to dir_path_match()
pathspec: convert some match_pathspec_depth() to ce_path_match()
Diffstat (limited to 'builtin/checkout.c')
-rw-r--r-- | builtin/checkout.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 5df3837e3..ada51fa70 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -297,8 +297,7 @@ static int checkout_paths(const struct checkout_opts *opts, * match_pathspec() for _all_ entries when * opts->source_tree != NULL. */ - if (match_pathspec_depth(&opts->pathspec, ce->name, ce_namelen(ce), - 0, ps_matched)) + if (ce_path_match(ce, &opts->pathspec, ps_matched)) ce->ce_flags |= CE_MATCHED; } |