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 /mergetools/vimdiff | |
| parent | d365a27bf7ba15884a15f31f88ba5adc171c0913 (diff) | |
| parent | bac28a942a08d8812a89649c1198ae7abd539ec1 (diff) | |
| download | git-8890b4f37eec774af3313218e73b94e219f655c3.tar.gz | |
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 'mergetools/vimdiff')
| -rw-r--r-- | mergetools/vimdiff | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff index 734d15a03b..f8ad6b35d4 100644 --- a/mergetools/vimdiff +++ b/mergetools/vimdiff @@ -325,7 +325,7 @@ gen_cmd () { fi # If this is a single window diff with all the buffers - if ! echo "$tab" | grep ",\|/" >/dev/null + if ! echo "$tab" | grep -E ",|/" >/dev/null then CMD="$CMD | silent execute 'bufdo diffthis'" fi |