]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'nd/submodule-pathspec-ending-with-slash'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:15 +0000 (14:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Feb 2014 22:01:15 +0000 (14:01 -0800)
commitcbaeafc3251d08b479c5eb735444bb6ad6210c93
tree5513bd0aab1246167f737639e72022c0de64b1a6
parent156d6ed9221ff38c4cd3bfcfc6778e31c104fd9b
parent2e70c01799bf663cc1fa5f6e37e025000ffdc0b0
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()
builtin/commit.c
builtin/rm.c
builtin/update-index.c
cache.h
read-cache.c
resolve-undo.c
t/t4010-diff-pathspec.sh