Merge branch 'mh/packed-ref-store-prep' into next

diff --git a/t/t5001-archive-attr.sh b/t/t5001-archive-attr.sh
index 063622bc7147f2e4f69c11c4890ec6662d334e36..897f6f06d55a9790a237b75c12eaab95763d1864 100755 (executable)
--- a/t/t5001-archive-attr.sh
+++ b/t/t5001-archive-attr.sh
@@ -76,7 +76,7 @@ test_expect_exists    archive-pathspec/ignored-by-worktree
 test_expect_missing    archive-pathspec/excluded-by-pathspec.d failure
 test_expect_missing    archive-pathspec/excluded-by-pathspec.d/file
 
-test_expect_failure 'git archive with wildcard pathspec' '
+test_expect_success 'git archive with wildcard pathspec' '
        git archive HEAD ":!excluded-by-p*" >archive-pathspec-wildcard.tar &&
        extract_tar_to_dir archive-pathspec-wildcard
 '
@@ -85,7 +85,7 @@ test_expect_missing   archive-pathspec-wildcard/ignored
 test_expect_missing    archive-pathspec-wildcard/ignored-by-tree
 test_expect_missing    archive-pathspec-wildcard/ignored-by-tree.d
 test_expect_missing    archive-pathspec-wildcard/ignored-by-tree.d/file
-test_expect_exists     archive-pathspec-wildcard/ignored-by-worktree failure
+test_expect_exists     archive-pathspec-wildcard/ignored-by-worktree
 test_expect_missing    archive-pathspec-wildcard/excluded-by-pathspec.d
 test_expect_missing    archive-pathspec-wildcard/excluded-by-pathspec.d/file