t2400: rewrite regex to avoid unintentional PCRE

Replace all cases of `\s` with ` ` as it is not part of POSIX BRE or ERE
and therefore not all versions of grep handle it.

For the same reason all cases of `\S` are replaced with `[^ ]`. It is
not an exact replacement but it is close enough for this use case.

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 `.*` from the end of a pattern that is not right-anchored.

Signed-off-by: Jacob Abel <jacobabel@nullpo.dev>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh
index e106540c6d9c94325e3566ff0ec2dc83f538998a..051363acbbc784ec5b2cc3d0c6ddfc3af87cdd6c 100755 (executable)
--- 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:\s+git worktree add --orphan -b \S+ \S+\s*$" actual
+                       grep -E "^hint: +git worktree add --orphan -b [^ ]+ [^ ]+$" actual
                else
-                       grep -E "^hint:\s+git worktree add --orphan \S+\s*$" 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:\s\+.*" &&
-       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" &&
@@ -998,8 +998,8 @@ test_dwim_orphan () {
                                        headpath=$(git $dashc_args rev-parse --path-format=absolute --git-path HEAD) &&
                                        headcontents=$(cat "$headpath") &&
                                        grep "HEAD points to an invalid (or orphaned) reference" actual &&
-                                       grep "HEAD path:\s*.$headpath." actual &&
-                                       grep "HEAD contents:\s*.$headcontents." actual &&
+                                       grep "HEAD path: .$headpath." actual &&
+                                       grep "HEAD contents: .$headcontents." actual &&
                                        grep "$orphan_hint" actual &&
                                        ! grep "$info_text" actual
                                fi &&