From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Feb 2019 05:20:19 +0000 (-0800)
Subject: Merge branch 'ab/bsd-fixes'
X-Git-Tag: v2.21.0~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c65a2884eae159bad540135479bc8afe20ff62d1?hp=b9cc405612f6badded21cb526cdeaa627fecbb37

Merge branch 'ab/bsd-fixes'

Test portability fix.

* ab/bsd-fixes:
commit-graph tests: fix unportable "dd" invocation
tests: fix unportable "\?" and "\+" regex syntax
---

diff --git a/t/t1300-config.sh b/t/t1300-config.sh
index 9652b241c7..428177c390 100755
--- 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 &&