Merge branch 'nd/submodule-pathspec-ending-with-slash' into maint
commit6a0556e4c0d0174d4c1760469e0f4d348b5ca844
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 20:58:58 +0000 (18 13:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Mar 2014 20:58:58 +0000 (18 13:58 -0700)
tree7d4d03f407db1fa352021dd9f843d57e52a28d9a
parent16216b6ab1073b7aaa8225c32208758e6ea16629
parent2e70c01799bf663cc1fa5f6e37e025000ffdc0b0
Merge branch 'nd/submodule-pathspec-ending-with-slash' into maint

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 (such a slash is often
given by command line completion).

* 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()
t/t4010-diff-pathspec.sh