Merge branch 'maint'

diff --git a/t/t6130-pathspec-noglob.sh b/t/t6130-pathspec-noglob.sh
index 49c148e17efab0bc512ca09ec4a37a448f8ec1a6..ea00d71e77e05af212e2d69b3eced450b119fcf1 100755 (executable)
--- a/t/t6130-pathspec-noglob.sh
+++ b/t/t6130-pathspec-noglob.sh
@@ -32,6 +32,16 @@ test_expect_success 'star pathspec globs' '
        test_cmp expect actual
 '
 
+test_expect_success 'star pathspec globs' '
+       cat >expect <<-\EOF &&
+       bracket
+       star
+       vanilla
+       EOF
+       git log --format=%s -- ":(glob)f*" >actual &&
+       test_cmp expect actual
+'
+
 test_expect_success 'bracket pathspec globs and matches literal brackets' '
        cat >expect <<-\EOF &&
        bracket
@@ -41,6 +51,15 @@ test_expect_success 'bracket pathspec globs and matches literal brackets' '
        test_cmp expect actual
 '
 
+test_expect_success 'bracket pathspec globs and matches literal brackets' '
+       cat >expect <<-\EOF &&
+       bracket
+       vanilla
+       EOF
+       git log --format=%s -- ":(glob)f[o][o]" >actual &&
+       test_cmp expect actual
+'
+
 test_expect_success 'no-glob option matches literally (vanilla)' '
        echo vanilla >expect &&
        git --literal-pathspecs log --format=%s -- foo >actual &&
@@ -77,10 +96,60 @@ test_expect_success 'no-glob option matches literally (bracket)' '
        test_cmp expect actual
 '
 
+test_expect_success 'no-glob option disables :(literal)' '
+       : >expect &&
+       git --literal-pathspecs log --format=%s -- ":(literal)foo" >actual &&
+       test_cmp expect actual
+'
+
 test_expect_success 'no-glob environment variable works' '
        echo star >expect &&
        GIT_LITERAL_PATHSPECS=1 git log --format=%s -- "f*" >actual &&
        test_cmp expect actual
 '
 
+test_expect_success 'setup xxx/bar' '
+       mkdir xxx &&
+       test_commit xxx xxx/bar
+'
+
+test_expect_success '**/ works with :(glob)' '
+       cat >expect <<-\EOF &&
+       xxx
+       unrelated
+       EOF
+       git log --format=%s -- ":(glob)**/bar" >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success '**/ does not work with --noglob-pathspecs' '
+       : >expect &&
+       git --noglob-pathspecs log --format=%s -- "**/bar" >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success '**/ works with :(glob) and --noglob-pathspecs' '
+       cat >expect <<-\EOF &&
+       xxx
+       unrelated
+       EOF
+       git --noglob-pathspecs log --format=%s -- ":(glob)**/bar" >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success '**/ works with --glob-pathspecs' '
+       cat >expect <<-\EOF &&
+       xxx
+       unrelated
+       EOF
+       git --glob-pathspecs log --format=%s -- "**/bar" >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success '**/ does not work with :(literal) and --glob-pathspecs' '
+       : >expect &&
+       git --glob-pathspecs log --format=%s -- ":(literal)**/bar" >actual &&
+       test_cmp expect actual
+'
+
 test_done