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/t9140-git-svn-reset.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/t9140-git-svn-reset.sh')
| -rwxr-xr-x | t/t9140-git-svn-reset.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t9140-git-svn-reset.sh b/t/t9140-git-svn-reset.sh index e855904629..a420b2a87a 100755 --- a/t/t9140-git-svn-reset.sh +++ b/t/t9140-git-svn-reset.sh @@ -43,7 +43,7 @@ test_expect_success 'fetch fails on modified hidden file' ' git svn find-rev refs/remotes/git-svn > ../expect && test_must_fail git svn fetch 2> ../errors && git svn find-rev refs/remotes/git-svn > ../expect2 ) && - fgrep "not found in commit" errors && + grep "not found in commit" errors && test_cmp expect expect2 ' @@ -59,7 +59,7 @@ test_expect_success 'refetch succeeds not ignoring any files' ' ( cd g && git svn fetch && git svn rebase && - fgrep "mod hidden" hid/hid.txt + grep "mod hidden" hid/hid.txt ) ' |