Fourth batch

diff --git a/t/t6132-pathspec-exclude.sh b/t/t6132-pathspec-exclude.sh
index e1e1b1fa382fa3ea129450770d575bffdddc47b9..2462b19ddd35eea986bbe0cdc62806bc455c06d8 100755 (executable)
--- a/t/t6132-pathspec-exclude.sh
+++ b/t/t6132-pathspec-exclude.sh
@@ -7,7 +7,7 @@ test_description='test case exclude pathspec'
 test_expect_success 'setup' '
        for p in file sub/file sub/sub/file sub/file2 sub/sub/sub/file sub2/file; do
                if echo $p | grep /; then
-                       mkdir -p `dirname $p`
+                       mkdir -p $(dirname $p)
                fi &&
                : >$p &&
                git add $p &&
@@ -25,8 +25,10 @@ EOF
        test_cmp expect actual
 '
 
-test_expect_success 'exclude only should error out' '
-       test_must_fail git log --oneline --format=%s -- ":(exclude)sub"
+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
 '
 
 test_expect_success 't_e_i() exclude sub' '
@@ -181,4 +183,32 @@ 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_expect_success 't_e_i() exclude case #8' '
+       git init case8 &&
+       (
+               cd case8 &&
+               echo file >file1 &&
+               echo file >file2 &&
+               git add file1 file2 &&
+               git commit -m twofiles &&
+               git grep -l file HEAD :^file2 >actual &&
+               echo HEAD:file1 >expected &&
+               test_cmp expected actual &&
+               git grep -l file HEAD :^file1 >actual &&
+               echo HEAD:file2 >expected &&
+               test_cmp expected actual
+       )
+'
+
 test_done