Merge branch 'maint'

diff --git a/t/t3102-ls-tree-wildcards.sh b/t/t3102-ls-tree-wildcards.sh
index c286854485d065816ff2c9fdd225c54734d48b60..4d4b02e760d322586eb496d72d0fd6c6b6946a02 100755 (executable)
--- a/t/t3102-ls-tree-wildcards.sh
+++ b/t/t3102-ls-tree-wildcards.sh
@@ -12,11 +12,25 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'ls-tree a[a] matches literally' '
-       cat >expected <<EOF &&
-100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391   a[a]/three
-EOF
+       cat >expect <<-\EOF &&
+       100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391    a[a]/three
+       EOF
        git ls-tree -r HEAD "a[a]" >actual &&
-       test_cmp expected actual
+       test_cmp expect actual
+'
+
+test_expect_success 'ls-tree outside prefix' '
+       cat >expect <<-\EOF &&
+       100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391    ../a[a]/three
+       EOF
+       ( cd aa && git ls-tree -r HEAD "../a[a]"; ) >actual &&
+       test_cmp expect actual
+'
+
+test_expect_failure 'ls-tree does not yet support negated pathspec' '
+       git ls-files ":(exclude)a" "a*" >expect &&
+       git ls-tree --name-only -r HEAD ":(exclude)a" "a*" >actual &&
+       test_cmp expect actual
 '
 
 test_done