Re: [PATCH v3 3/3] t2400: rewrite regex to avoid unintentional PCRE
From: Junio C Hamano <hidden>
Date: 2023-07-21 15:49:33
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2023-07-22 · Re: [PATCH v3 3/3] t2400: rewrite regex to avoid unintentional PCRE · Jacob Abel <hidden>
- 2023-07-21 · Re: [PATCH v3 3/3] t2400: rewrite regex to avoid unintentional PCRE · Junio C Hamano <hidden>
- 2023-07-21 · [PATCH v3 3/3] t2400: rewrite regex to avoid unintentional PCRE · Jacob Abel <hidden>
Just for reference, here is a summary, as a squashable commit, of the message I am responding to. ---- >8 ---- Subject: [PATCH] SQUASH??? (remove this part of the message while squashing) Use ` `, not `[ ]`, as the proposed log message described. (append to the proposed log message of the previous) Also, do not write `\+` in BRE and expect it to mean 1 or more; it is a GNU extension that may not work everywhere. Remove '.*' at the end of a pattern that is not right-anchored. Helped-by: Junio C Hamano [off-list ref] --- t/t2400-worktree-add.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh
index eafecdf7ce..aee5eba980 100755
--- a/t/t2400-worktree-add.sh
+++ b/t/t2400-worktree-add.sh@@ -417,9 +417,9 @@ test_wt_add_orphan_hint () { grep "hint: If you meant to create a worktree containing a new orphan branch" actual && if [ $use_branch -eq 1 ] then - grep -E "^hint:[ ]+git worktree add --orphan -b [^ ]+ [^ ]+$" actual + grep -E "^hint: +git worktree add --orphan -b [^ ]+ [^ ]+$" actual else - grep -E "^hint:[ ]+git worktree add --orphan [^ ]+$" actual + grep -E "^hint: +git worktree add --orphan [^ ]+$" actual fi '
@@ -709,8 +709,8 @@ test_dwim_orphan () { local info_text="No possible source branch, inferring '--orphan'" && local fetch_error_text="fatal: No local or remote refs exist despite at least one remote" && local orphan_hint="hint: If you meant to create a worktree containing a new orphan branch" && - local invalid_ref_regex="^fatal: invalid reference: .*" && - local bad_combo_regex="^fatal: '[a-z-]\+' and '[a-z-]\+' cannot be used together" && + local invalid_ref_regex="^fatal: invalid reference: " && + local bad_combo_regex="^fatal: '[-a-z]*' and '[-a-z-]*' cannot be used together" && local git_ns="repo" && local dashc_args="-C $git_ns" &&
--
2.41.0-376-gcba07a324d