diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-10-03 15:42:50 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-10-03 15:42:50 +0900 |
commit | 9124cca61f7edfed70dc5d8bced7fb7cb9fe2221 (patch) | |
tree | e4846bbf73f9bffa34938081fcb839f646153d42 /t | |
parent | Merge branch 'sb/submodule-diff-header-fix' (diff) | |
parent | docs: improve discoverability of exclude pathspec (diff) | |
download | tgif-9124cca61f7edfed70dc5d8bced7fb7cb9fe2221.tar.xz |
Merge branch 'mr/doc-negative-pathspec'
Doc updates.
* mr/doc-negative-pathspec:
docs: improve discoverability of exclude pathspec
Diffstat (limited to 't')
-rwxr-xr-x | t/t6132-pathspec-exclude.sh | 13 |
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 |