diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-23 11:04:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-23 11:04:29 -0700 |
| commit | 8890b4f37eec774af3313218e73b94e219f655c3 (patch) | |
| tree | 67551a571f452d8b803eaca793e1411835469c52 /t/t1404-update-ref-errors.sh | |
| parent | d365a27bf7ba15884a15f31f88ba5adc171c0913 (diff) | |
| parent | bac28a942a08d8812a89649c1198ae7abd539ec1 (diff) | |
Merge branch 'mt/openindiana-portability'
Portability updates to various uses of grep and sed.
* mt/openindiana-portability:
t/t9001-send-email.sh: sed - remove the i flag for s
t/t9118-git-svn-funky-branch-names.sh: sed needs semicolon
t/t1700-split-index.sh: mv -v is not portable
t/t4202-log.sh: fix misspelled variable
t/t0600-reffiles-backend.sh: rm -v is not portable
t/t9902-completion.sh: backslashes in echo
Switch grep from non-portable BRE to portable ERE
Diffstat (limited to 't/t1404-update-ref-errors.sh')
| -rwxr-xr-x | t/t1404-update-ref-errors.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh index 98e9158bd2..67ebd81a4c 100755 --- a/t/t1404-update-ref-errors.sh +++ b/t/t1404-update-ref-errors.sh @@ -100,7 +100,7 @@ df_test() { printf "%s\n" "delete $delname" "create $addname $D" fi >commands && test_must_fail git update-ref --stdin <commands 2>output.err && - grep "fatal:\( cannot lock ref $SQ$addname$SQ:\)\? $SQ$delref$SQ exists; cannot create $SQ$addref$SQ" output.err && + grep -E "fatal:( cannot lock ref $SQ$addname$SQ:)? $SQ$delref$SQ exists; cannot create $SQ$addref$SQ" output.err && printf "%s\n" "$C $delref" >expected-refs && git for-each-ref --format="%(objectname) %(refname)" $prefix/r >actual-refs && test_cmp expected-refs actual-refs |