summaryrefslogtreecommitdiff
path: root/t/t4010-diff-pathspec.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-02-27 14:01:15 -0800
committerJunio C Hamano <gitster@pobox.com>2014-02-27 14:01:15 -0800
commitcbaeafc3251d08b479c5eb735444bb6ad6210c93 (patch)
tree5513bd0aab1246167f737639e72022c0de64b1a6 /t/t4010-diff-pathspec.sh
parent156d6ed9221ff38c4cd3bfcfc6778e31c104fd9b (diff)
parent2e70c01799bf663cc1fa5f6e37e025000ffdc0b0 (diff)
downloadgit-cbaeafc3251d08b479c5eb735444bb6ad6210c93.tar.gz
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 't/t4010-diff-pathspec.sh')
-rwxr-xr-xt/t4010-diff-pathspec.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index 9f5659f7fe..2bb973655b 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -140,4 +140,10 @@ test_expect_success 'diff multiple wildcard pathspecs' '
test_cmp expect actual
'
+test_expect_success 'diff-cache ignores trailing slash on submodule path' '
+ git diff --name-only HEAD^ submod >expect &&
+ git diff --name-only HEAD^ submod/ >actual &&
+ test_cmp expect actual
+'
+
test_done