git log: support "auto" decorations

diff --git a/t/t4010-diff-pathspec.sh b/t/t4010-diff-pathspec.sh
index d30ff34be7ebaf01ef22ce63cc2d1beeccf6a057..2bb973655bf043cc43292764ffd68becda25aa2e 100755 (executable)
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -127,6 +127,19 @@ test_expect_success 'diff-tree ignores trailing slash on submodule path' '
        test_cmp expect actual
 '
 
+test_expect_success 'diff multiple wildcard pathspecs' '
+       mkdir path2 &&
+       echo rezrov >path2/file1 &&
+       git update-index --add path2/file1 &&
+       tree3=`git write-tree` &&
+       git diff --name-only $tree $tree3 -- "path2*1" "path1*1" >actual &&
+       cat <<-\EOF >expect &&
+       path1/file1
+       path2/file1
+       EOF
+       test_cmp expect actual
+'
+
 test_expect_success 'diff-cache ignores trailing slash on submodule path' '
        git diff --name-only HEAD^ submod >expect &&
        git diff --name-only HEAD^ submod/ >actual &&