Merge branch 'da/difftool-mergetool-simplify-reporting-status'

diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 7b8babd89b22dc94d3a3f839d72cce86c5aaea59..d01bbdc968a0fcde9eb5410793f8a22108ee6c2d 100755 (executable)
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -305,4 +305,18 @@ test_expect_success GZIP 'remote tar.gz can be disabled' '
                >remote.tar.gz
 '
 
+test_expect_success 'archive and :(glob)' '
+       git archive -v HEAD -- ":(glob)**/sh" >/dev/null 2>actual &&
+       cat >expect <<EOF &&
+a/
+a/bin/
+a/bin/sh
+EOF
+       test_cmp expect actual
+'
+
+test_expect_success 'catch non-matching pathspec' '
+       test_must_fail git archive -v HEAD -- "*.abc" >/dev/null
+'
+
 test_done