diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-09-23 08:31:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-23 08:31:04 -0700 |
| commit | 75fc96d57e1262fe4b6bf87b5887e9103bcca7fb (patch) | |
| tree | 4450e029e7429879269b18f0937854211b73f719 /t/t9133-git-svn-nested-git-repo.sh | |
| parent | 4b79ee4b0cd1130ba8907029cdc5f6a1632aca26 (diff) | |
| parent | 37eb90f79a97cfeb216c7afe7bb0f129edfc10e4 (diff) | |
| download | git-75fc96d57e1262fe4b6bf87b5887e9103bcca7fb.tar.gz | |
Merge branch 'dd/retire-efgrep' into es/retire-efgrep
* dd/retire-efgrep:
t: convert fgrep usage to "grep -F"
t: convert egrep usage to "grep -E"
t: remove \{m,n\} from BRE grep usage
CodingGuidelines: allow grep -E
Diffstat (limited to 't/t9133-git-svn-nested-git-repo.sh')
| -rwxr-xr-x | t/t9133-git-svn-nested-git-repo.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t9133-git-svn-nested-git-repo.sh b/t/t9133-git-svn-nested-git-repo.sh index f894860867..d8d536269c 100755 --- a/t/t9133-git-svn-nested-git-repo.sh +++ b/t/t9133-git-svn-nested-git-repo.sh @@ -35,7 +35,7 @@ test_expect_success 'SVN-side change outside of .git' ' echo b >> a && svn_cmd commit -m "SVN-side change outside of .git" && svn_cmd up && - svn_cmd log -v | fgrep "SVN-side change outside of .git" + svn_cmd log -v | grep -F "SVN-side change outside of .git" ) ' @@ -59,7 +59,7 @@ test_expect_success 'SVN-side change inside of .git' ' svn_cmd add --force .git && svn_cmd commit -m "SVN-side change inside of .git" && svn_cmd up && - svn_cmd log -v | fgrep "SVN-side change inside of .git" + svn_cmd log -v | grep -F "SVN-side change inside of .git" ) ' @@ -82,7 +82,7 @@ test_expect_success 'SVN-side change in and out of .git' ' git commit -m "add a inside an SVN repo" && svn_cmd commit -m "SVN-side change in and out of .git" && svn_cmd up && - svn_cmd log -v | fgrep "SVN-side change in and out of .git" + svn_cmd log -v | grep -F "SVN-side change in and out of .git" ) ' |