Merge branch 'js/bundle-verify-require-object-store' into maint

diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 9652b241c7cf182a4b26cac5f474183bd166ceaa..428177c390dbe726c2aa9df4eb9c6f9d54766049 100755 (executable)
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -892,6 +892,7 @@ test_expect_success 'get --expiry-date' '
        1510348087
        0
        EOF
+       : "work around heredoc parsing bug fixed in dash 0.5.7 (in ec2c84d)" &&
        {
                echo "$rel_out $(git config --expiry-date date.valid1)"
                git config --expiry-date date.valid2 &&