at 24.11-pre 1.2 kB view raw
1From 13672e53371ea9593130bdca178f3b8b2e174032 Mon Sep 17 00:00:00 2001 2From: Alyssa Ross <hi@alyssa.is> 3Date: Thu, 25 Apr 2024 09:10:54 +0200 4Subject: [PATCH] Revert "Fix grepdiff test" 5MIME-Version: 1.0 6Content-Type: text/plain; charset=UTF-8 7Content-Transfer-Encoding: 8bit 8 9This reverts commit a6538753a51db973a05c9034ed78f2dd946453db. 10 11There's no need for an escape here, because POSIX regexes don't treat 12'+' specially if it's at the start of the experssion. musl rejects 13the version with the backslash. 14 15I'm still not clear why this change was made in the first place, but 16reverting it seems to make the test pass on both glibc and musl… 17 18Link: https://github.com/twaugh/patchutils/issues/61 19--- 20 tests/grepdiff1/run-test | 2 +- 21 1 file changed, 1 insertion(+), 1 deletion(-) 22 23diff --git a/tests/grepdiff1/run-test b/tests/grepdiff1/run-test 24index c4311f8..c3cebdd 100755 25--- a/tests/grepdiff1/run-test 26+++ b/tests/grepdiff1/run-test 27@@ -20,7 +20,7 @@ cat << EOF > diff 28 +b 29 EOF 30 31-${GREPDIFF} '\+a' diff 2>errors >index || exit 1 32+${GREPDIFF} '+a' diff 2>errors >index || exit 1 33 [ -s errors ] && exit 1 34 35 cat << EOF | cmp - index || exit 1 36-- 372.44.0 38