mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
tests: avoid syntax triggering old dash bug
Avoid a bug in dash that's been fixed ever since its ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first released with dash v0.5.7 in July 2011. This failing test was introduced in5f9674243d
("config: add --expiry-date", 2017-11-18). This fixes 1/2 tests failing on Debian Lenny & Squeeze. The other failure is due to1b42f45255
("git-svn: apply "svn.pathnameencoding" before URL encoding", 2016-02-09). The dash bug is triggered by this test because the heredoc contains a command embedded in "$()" with a "{}" block coming right after it. Refactoring the "$()" to e.g. be a variable that was set earlier will also work around it, but let's instead break up the "EOF" and the "{}". An earlier version of this patch[2] mitigated the issue by breaking the "$()" out of the "{}" block, that worked, but just because it broke up the "EOF" and "{}" block. Putting e.g. "echo &&" between the two would also work. 1. https://git.kernel.org/pub/scm/utils/dash/dash.git/ 2. https://public-inbox.org/git/20181127164253.9832-1-avarab@gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
0d0ac3826a
commit
d38722eb10
|
@ -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 &&
|
||||
|
|
Loading…
Reference in a new issue