Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-10-18 08:19:12 +0300
committerJunio C Hamano <gitster@pobox.com>2017-10-18 08:19:12 +0300
commit8a19eeed795de950714703488c7c8ffb4eb513c2 (patch)
tree397f9de7a19925a3701af7a97d4b7711f7ab4aec /t
parent41052b11bc5a128c6a4266ea60c712a088cb2166 (diff)
parent93dbefb389a011c9107a3908fd38e743055be267 (diff)
Merge branch 'mr/doc-negative-pathspec' into maint
Doc updates. * mr/doc-negative-pathspec: docs: improve discoverability of exclude pathspec
Diffstat (limited to 't')
-rwxr-xr-xt/t6132-pathspec-exclude.sh13
1 files changed, 12 insertions, 1 deletions
diff --git a/t/t6132-pathspec-exclude.sh b/t/t6132-pathspec-exclude.sh
index 9dd5cde5fc..eb829fce97 100755
--- a/t/t6132-pathspec-exclude.sh
+++ b/t/t6132-pathspec-exclude.sh
@@ -25,7 +25,7 @@ EOF
test_cmp expect actual
'
-test_expect_success 'exclude only no longer errors out' '
+test_expect_success 'exclude only pathspec uses default implicit pathspec' '
git log --oneline --format=%s -- . ":(exclude)sub" >expect &&
git log --oneline --format=%s -- ":(exclude)sub" >actual &&
test_cmp expect actual
@@ -183,4 +183,15 @@ EOF
test_cmp expect actual
'
+test_expect_success 'multiple exclusions' '
+ git ls-files -- ":^*/file2" ":^sub2" >actual &&
+ cat <<-\EOF >expect &&
+ file
+ sub/file
+ sub/sub/file
+ sub/sub/sub/file
+ EOF
+ test_cmp expect actual
+'
+
test_done